tree d6e3b71a2e7687973a866e6fe8c4952f41e6b1e1
parent 27414260a7724290364c149fe3d0c3a153ae9662
parent 8363be7e61d1a0bb39dd76fbebc948a1fcfc8c39
author Ed Heyl <edheyl@google.com> 1382459870 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382459870 -0700

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

* commit '8363be7e61d1a0bb39dd76fbebc948a1fcfc8c39':
  override Launcher2 (aosp)