tree 33d0f9c5acf403c612c2c8f5b882ddb02d7b8500
parent f0a0efaa04e5684ff844d327e42495a76ffc79db
parent ae45db052a5e3e7817a09461558158a6670c013e
author Amith Yamasani <yamasani@google.com> 1365898930 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365898930 -0700

am ae45db05: Update to match API rename

* commit 'ae45db052a5e3e7817a09461558158a6670c013e':
  Update to match API rename