tree 10da860fcff71886af91d082e31f0e1917926848
parent 07cbd17633d03fd23d4075f1723ad225a426c9e0
parent 388c7d2783a60be99e76f8cc526b5106a755590b
author Ed Heyl <edheyl@google.com> 1414566065 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566065 +0000

am 388c7d27: am c0fa603b: am 8363be7e: am 6811c5a4: override Launcher2 (aosp)

* commit '388c7d2783a60be99e76f8cc526b5106a755590b':