tree 36f1edeb71605bca2010b8d507ff65133fbc0396
parent 0d166d8771413866d48aaf7e3b9baf8da3315f0c
parent 4f98332b98bbe95cb0574e51ef1514bade9a5e76
author Ed Heyl <edheyl@google.com> 1382120307 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382120307 -0700

am 4f98332b: am 6811c5a4: override Launcher2 (aosp)

* commit '4f98332b98bbe95cb0574e51ef1514bade9a5e76':
  override Launcher2 (aosp)