| commit | 96fca845de009784972b9e928d1cb1e89f780499 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jul 24 23:30:16 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 24 23:30:16 2017 +0000 |
| tree | c18346604d1d7d88294d0ec655283cb533e95eb8 | |
| parent | da87ca84e971ce1a263c8348a27d73cc469f94f2 [diff] | |
| parent | 5bebb30c2b0bcceba9077b59f53f90f95ae2b0c1 [diff] |
Merge "Merge "Camera: fix emulator deadlock" into oc-dr1-dev am: 84201fee0b am: 78611d7da9" into oc-mr1-dev-plus-aosp