tree de8165ca332695d1f292f0b51f061b6cdf6de5db
parent 91695a0cdc0aaab3d3f939d9adb8855938b4f69d
parent 7ea33eac4b57aabf9326d60f52e3ed85217ac846
author Irfan Sheriff <isheriff@google.com> 1366386970 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366386971 +0000

Merge "Fix API name" into jb-mr2-dev