Merge "Camera: Do not signal AutoConditionLock if acquisition times out" into nyc-dev am: bb6ac182
am: f8e8389f
* commit 'f8e8389f':
Camera: Do not signal AutoConditionLock if acquisition times out
Change-Id: I378f9bcbfbd213788d577dc7b4894f82fbd20311