tree 244c1307f495cddc0386d50edbf87477cb58d8f9
parent 5338bead7fae9113048bfbb99d7a3ef4a9c2b153
parent 03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9
author Derek Tan <derektan@google.com> 1464220212 +0000
committer android-build-merger <android-build-merger@google.com> 1464220212 +0000

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

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d