tree f0da2634196b72fb02dedc635cd63fcab42c0762
parent c6e6969448c9220fc25ca28783cf674abddd55a6
parent d3a955cd03366ef1a256345f6986db3aaad6f86a
author Nicolas Geoffray <ngeoffray@google.com> 1524499211 -0700
committer android-build-merger <android-build-merger@google.com> 1524499211 -0700

Merge "Merge "Add more light grey APIs." into pi-dev am: 4c9902ada3" into pi-dev-plus-aosp
am: d3a955cd03

Change-Id: I333fc8519a0378a3a60cc9584e2586a456d89587