tree cba62d0d64153aa2169651696bc238591341d679
parent 7a20d40ffeb7615efff22f75c44153e6502cf40c
parent c0fa603bf1c886c91cbb37b7f0f1d1d4bcb40725
author Ed Heyl <edheyl@google.com> 1414085111 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085111 +0000

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

* commit 'c0fa603bf1c886c91cbb37b7f0f1d1d4bcb40725':