tree 1a54044116e8db77854364774712216565311153
parent 96167e3eed33fd40f56930385701971da5b39db5
parent 1a934f9f2e91be745f6b77f0a3836ed79824e053
author Nicolas Geoffray <ngeoffray@google.com> 1526548064 -0700
committer android-build-merger <android-build-merger@google.com> 1526548064 -0700

[automerger skipped] Merge "Add more APIs to light grey." into pi-dev am: 2891fe6c61
am: 1a934f9f2e  -s ours

Change-Id: I10efb0b677c830272f3632356f0df8e18b4c9a37