tree 4af660acb1f3bfc9054913ee53c86378a0a420c9
parent 8acdb5534919b52c9bf2b50757af3ca8e8647f49
parent 5006d07640f7d25429ca6d74c764e0614a9d4206
author Kenny Guy <kennyguy@google.com> 1442956595 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442956595 +0000

am 5006d076: am 91ffff34: am b8094735: am 048c2941: am d0ad0a0e: am 8059f876: am 39482cfa: am 19a41464: am 6cfe86ad: am 41f66cec: am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev

* commit '5006d07640f7d25429ca6d74c764e0614a9d4206':