tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 33e07b704107c86a6caea874dfdcc9a99e3b5a88
parent 7473d692c6953ce7bc33898fdead1a5dbf5c8e0e
author Kenny Guy <kennyguy@google.com> 1422685323 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685323 +0000

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

* commit '7473d692c6953ce7bc33898fdead1a5dbf5c8e0e':