| commit | da87ca84e971ce1a263c8348a27d73cc469f94f2 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Mon Jul 24 23:29:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 24 23:29:56 2017 +0000 |
| tree | c18346604d1d7d88294d0ec655283cb533e95eb8 | |
| parent | 6d699a3ac5853b87032f23217dc4b70b486225ca [diff] | |
| parent | 5c2bdf6a7042d68f9ae2d2f58cf3bae1c44fcab9 [diff] |
Merge "Camera: fix emulator deadlock" into oc-dr1-dev am: 84201fee0b am: 5c2bdf6a70 Change-Id: I5c88334d8962d2f42399bef52bf3fe15061c9914