commit | 6a18b403b2918e081fa94e8b5f1f5b5572d01675 | [log] [tgz] |
---|---|---|
author | Emilian Peev <epeev@google.com> | Tue Aug 15 21:42:39 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 21:42:39 2017 +0000 |
tree | 5a4058d422e21d65b0ca5cfc48e047a01d33a8ee | |
parent | d0fd21d6ef94e0069a06753ecd68bc9fe708a07f [diff] | |
parent | c840cf40b95c41a31d5e82d087f0f77aa3cfb3c2 [diff] |
Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev am: 92d3bc1e1a -s ours am: c840cf40b9 Change-Id: Ida458300da7171d8fb65f89291544a93ff0684d5