tree cc23bb4af49f34d3df07d554d286b4c146912a90
parent 1e9f457038cddf3149e3703931d30e2255e97e2b
parent 39482cfa790ae8733f4b2632a1ba4ccc9df544fe
author Kenny Guy <kennyguy@google.com> 1442952631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442952631 +0000

am 39482cfa: am 19a41464: am 6cfe86ad: am 41f66cec: am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev

* commit '39482cfa790ae8733f4b2632a1ba4ccc9df544fe':