| commit | c90d1eec823bb8d5258efed5faa2a22cafc127de | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Mon Jul 24 23:32:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 24 23:32:46 2017 +0000 |
| tree | 0be2d88f590fcc6264d6a4d728ad61852734be30 | |
| parent | 54d7f4682f1cf12fd93f09bda91b7f65b56ae3b6 [diff] | |
| parent | 96fca845de009784972b9e928d1cb1e89f780499 [diff] |
Merge "Merge "Camera: fix emulator deadlock" into oc-dr1-dev am: 84201fee0b am: 78611d7da9" into oc-mr1-dev-plus-aosp am: 96fca845de Change-Id: I9eef223932f6993e9fc90e6e61695a05d6c7f45d