tree 33d0f9c5acf403c612c2c8f5b882ddb02d7b8500
parent 21a89d56fe47c21e0680efb0bf2e05bdd1c8ec05
parent 451dc0811e2a32c2446b7b5dea9c97e43a721015
author Amith Yamasani <yamasani@google.com> 1365899117 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365899117 -0700

am 451dc081: am ae45db05: Update to match API rename

* commit '451dc0811e2a32c2446b7b5dea9c97e43a721015':
  Update to match API rename