| commit | fe8f3a8e89908f9bc4b26d285ff242870557a51d | [log] [tgz] |
|---|---|---|
| author | Emilian Peev <epeev@google.com> | Tue Aug 15 20:33:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 20:33:44 2017 +0000 |
| tree | d37374fd98b2216488283e0612c46dcefed845ed | |
| parent | 390ba0a0337dc2ea54154126b27331793ae8fad6 [diff] | |
| parent | 4fa40be5ef86cd4b702e410857e91b938df9cd8c [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258 am: 4fa40be5ef Change-Id: I9a628c55a78651550f663b28eb2ddff0c08cde25