| commit | 5c2bdf6a7042d68f9ae2d2f58cf3bae1c44fcab9 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Mon Jul 24 23:26:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 24 23:26:26 2017 +0000 |
| tree | b72ad2e652a602ebd601343ea2ad684bdec7ef8b | |
| parent | 49ef2a9a52db614cc0513a7f5087a558bb356524 [diff] | |
| parent | 84201fee0b18165187cb407378abef7723d82111 [diff] |
Merge "Camera: fix emulator deadlock" into oc-dr1-dev am: 84201fee0b Change-Id: Ie036606deb823fb8c33954fa76d37eee6d403e96