tree db8c2b09ceccf312eee90267949eb052bb4ff256
parent ebf59a896246b9b1603b779029c213f69d8875d4
parent 746a7382764975a380330f29b0479ebddb7cc2a6
author Elliott Hughes <enh@google.com> 1513644631 +0000
committer android-build-merger <android-build-merger@google.com> 1513644631 +0000

Merge "Private API became public..." am: eb44ebbfcd am: 85fc4d6dd6
am: 746a738276

Change-Id: Ifb1fd8dc812d160cd998ba23371e0cfff0c43adb