tree 10da860fcff71886af91d082e31f0e1917926848
parent 6858f998bea2a983ca8cb3ce1ba8101da699a1da
parent 280e9c2b1b6a3ae98817d868002f4220d2e96a76
author Kenny Guy <kennyguy@google.com> 1422666491 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666491 +0000

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

* commit '280e9c2b1b6a3ae98817d868002f4220d2e96a76':