tree 892a8435296389fdb514989a998d93476ece58de
parent 40953da40d07645141a58b3e57d01b0e8be14618
parent 08f5aa745d52f041bd5108e63e70fe2bbd63b556
author Nicolas Geoffray <ngeoffray@google.com> 1524488339 -0700
committer android-build-merger <android-build-merger@google.com> 1524488339 -0700

Merge "Add camera APIs to light grey." into pi-dev am: afc5b242d1
am: 08f5aa745d

Change-Id: I1cc9e8466998fe876f3526038af504df0922e56e