tree de59d23081e88f4dc515e4dcde7949ffd3a79cd3
parent 57b4ad9f5aea186e0bf1bee00371f02ed9d5eee4
parent 51a0e5b54680c659f333f186be1cf86d365e0db5
author Amith Yamasani <yamasani@google.com> 1409946223 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409946224 +0000

Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev