tree 28ea5d62cc35cbde56cbbbd6a02fb480ba735c06
parent 8586de0fa8d07491b9c090ce38e11f317e6f4fae
parent fb7eae5a0f3ce5817203f8583a1e82ff58f999d6
author Kenny Guy <kennyguy@google.com> 1410562176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410562176 +0000

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

* commit 'fb7eae5a0f3ce5817203f8583a1e82ff58f999d6':
  Update compat layer for API review changes to LauncherApps