tree cba62d0d64153aa2169651696bc238591341d679
parent ae5f7ce8ed2e385cba8d65a67d9b108c9c3590e8
parent 10f0db9f79256b7e02b65f341853d7238480f343
author Ed Heyl <edheyl@google.com> 1414085108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085108 +0000

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

* commit '10f0db9f79256b7e02b65f341853d7238480f343':
  override Launcher2 (aosp)