tree 10da860fcff71886af91d082e31f0e1917926848
parent 841607a41372f678c9989f8c0e007fdbf43b5d43
parent fb7eae5a0f3ce5817203f8583a1e82ff58f999d6
author Kenny Guy <kennyguy@google.com> 1422666517 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666517 +0000

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

* commit 'fb7eae5a0f3ce5817203f8583a1e82ff58f999d6':