tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 463eee63bd2d37b5b14910e8e8a953a6729afbef
parent bbdd20fdcf481f67b96dd71c0ac42b5c0e4c322e
author Kenny Guy <kennyguy@google.com> 1422669719 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669719 +0000

am bbdd20fd: am fb7eae5a: Merge "Update compat layer for API review changes to LauncherApps" into ub-now-porkchop automerge: cb213ba

* commit 'bbdd20fdcf481f67b96dd71c0ac42b5c0e4c322e':