| commit | d5f4f36d82a6d68d98f806f30353a1c73af7862c | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Aug 15 20:34:03 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 15 20:34:03 2017 +0000 |
| tree | d37374fd98b2216488283e0612c46dcefed845ed | |
| parent | fe8f3a8e89908f9bc4b26d285ff242870557a51d [diff] | |
| parent | 608728e42ee17bb8889f7207638178f390c26dd5 [diff] |
Merge "Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258 am: 5d18c87e88" into oc-dr1-dev-plus-aosp