tree a2ef2948928807707c432771e8217b6cca6c5168
parent b463d29a62572dc49c4ca7341530fac4be6b2b74
parent 0cfad5756654b4f8237cf33b3d21819d49b7f02f
author Yin-Chia Yeh <yinchiayeh@google.com> 1502480690 +0000
committer android-build-merger <android-build-merger@google.com> 1502480690 +0000

Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
am: 0cfad57566

Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a