| commit | 938a0a92b33178c7b8d8766b902d5e75bb3c6bb2 | [log] [tgz] |
|---|---|---|
| author | Yahan Zhou <yahan@google.com> | Fri Jun 23 18:10:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 18:10:15 2017 +0000 |
| tree | a423e9fa53e0981c342458559ca3a377d222d498 | |
| parent | db5e858c8c960cd4b2f71a2638604a7a217d04a1 [diff] | |
| parent | ac1a3ad5e128764f23cf44a6c73ad2147361c5bd [diff] |
Merge "Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a am: 2ff1f7e687" into oc-dr1-dev-plus-aosp am: ac1a3ad5e1 Change-Id: I8b3f099472428b615f511ece4b4ba3da0627ae3b