tree 3cea4c87ee2b57542172e09d18365e156c97403b
parent b05c3f5ed2e6774dd484a2bc799b430c69fe818c
parent 3fe5e2a13508ba12f3757619732f0810d1750dc2
author Irfan Sheriff <isheriff@google.com> 1366387216 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366387216 -0700

am 3fe5e2a1: am ba1311a3: Merge "Fix API name" into jb-mr2-dev

* commit '3fe5e2a13508ba12f3757619732f0810d1750dc2':
  Fix API name