tree 19aa5bb0e511cdcb415414fb5812a3d4ffa416d4
parent a91ed1cce3ec32fd06fbfd451f5e5693aa17fe6a
parent 04ecef31886cdcd41eff19f80a905c95abe57177
author Emilian Peev <epeev@google.com> 1491825475 +0000
committer android-build-merger <android-build-merger@google.com> 1491825475 +0000

Merge "Camera: Advertise AE/AWB locks in case they are supported" into oc-dev
am: 04ecef3188

Change-Id: I2c681f778dbb7bbbc3a4ede5a21fd513d4b6c4c5