tree 18006cbb433a05cd4c1545d16a88c18cf7b27dc8
parent a8a62569d6b1f898143fc1dbcc47a1f3c3131fd4
parent 5bbe8f30751b08b0766de670e164e1f2452ef679
author Ed Heyl <edheyl@google.com> 1392411149 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411149 +0000

am 5bbe8f30: am 3c4dd321: am 4f98332b: am 6811c5a4: override Launcher2 (aosp)

* commit '5bbe8f30751b08b0766de670e164e1f2452ef679':