| commit | 5bebb30c2b0bcceba9077b59f53f90f95ae2b0c1 | [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 | 78611d7da9283d999adc52126bd0888e94e7bd86 [diff] |
Merge "Camera: fix emulator deadlock" into oc-dr1-dev am: 84201fee0b am: 78611d7da9 Change-Id: I027e69ab449a08fd9af08c7d3eacfce416084941