tree 27a0043cfb5f5e37fc0a81ee65c5e141e1bfa55c
parent 13cf470f5c0e1542826e59a019e89046d15e65cf
parent bb6ac1823f7a3d74fbfac841dc74da556f05d2e7
author Shuzhen Wang <shuzhenwang@google.com> 1461716705 +0000
committer android-build-merger <android-build-merger@google.com> 1461716705 +0000

Merge "Camera: Do not signal AutoConditionLock if acquisition times out" into nyc-dev
am: bb6ac18

* commit 'bb6ac1823f7a3d74fbfac841dc74da556f05d2e7':
  Camera: Do not signal AutoConditionLock if acquisition times out

Change-Id: Id82748484941cfee19f989a953fc871f50239180