tree d6e3b71a2e7687973a866e6fe8c4952f41e6b1e1
parent c0fa603bf1c886c91cbb37b7f0f1d1d4bcb40725
parent 7138e5e03f3709c0912947fa9108c510f25a1497
author Ed Heyl <edheyl@google.com> 1382459871 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382459871 -0700

am 7138e5e0: am 17e01a29: keep history after reset to git reset to 6811c5a414a15fa34b4f6917c3f250b3498a89ed

* commit '7138e5e03f3709c0912947fa9108c510f25a1497':