tree 10da860fcff71886af91d082e31f0e1917926848
parent 42afc9d6a2b0c92aaf58315326a79fccc51718d8
parent 8695789a3ff6bbcdae0b6c08805d5b29c6fe50bc
author Ed Heyl <edheyl@google.com> 1414566062 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566062 +0000

am 8695789a: am 10f0db9f: keep history after reset to git reset to 8246a1434c12b607743222c22285b72c9a96497b

* commit '8695789a3ff6bbcdae0b6c08805d5b29c6fe50bc':
  override Launcher2 (aosp)