tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent f9ddcbab8b93d2fa176f2233e3682e94dee9b270
parent 58f0bc3db0155de722067b3d563db97884eb4c0b
author Kenny Guy <kennyguy@google.com> 1422669701 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669701 +0000

am 58f0bc3d: am 280e9c2b: am 49d5ca18: Merge "Updated calls for LauncherApps renaming." into ub-now-porkchop

* commit '58f0bc3db0155de722067b3d563db97884eb4c0b':