tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 8dbbab27c60ca894143eb42f649304256600cff2
parent 1e3ccd0648b2d4c2f9a3fee2a7782aea685566dc
author Kenny Guy <kennyguy@google.com> 1422685346 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685346 +0000

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

* commit '1e3ccd0648b2d4c2f9a3fee2a7782aea685566dc':