Merge "Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb am: e214ff00ea" into nyc-mr1-dev-plus-aosp

am: 4c0848d9c8

* commit '4c0848d9c80d25eee3c974b8e76fdabd01aa05b3':

Change-Id: Iaad8b76b54375424840484e2d0899148558c70d7
This commit is contained in:
Derek Tan
2016-05-26 00:16:48 +00:00
committed by android-build-merger

Diff Content Not Available