tree 2a8149d570f87381db757705de9e562ca96b6dfb
parent 1a2eb8131c0849965053ed6fb86dc88961ade73d
parent b489ec0a7e01ebfe0152aa406d2a98ddf3591ee0
author Emilian Peev <epeev@google.com> 1498701410 +0000
committer android-build-merger <android-build-merger@google.com> 1498701410 +0000

Merge "Camera: Add support for testing partial results" into oc-dev am: 98b7dd57dc am: ed0a5d2eba  -s ours
am: b489ec0a7e  -s ours

Change-Id: I02e28c82e2af6476b4dd02b87fd0011aa36e73ae