tree cba62d0d64153aa2169651696bc238591341d679
parent 388c7d2783a60be99e76f8cc526b5106a755590b
parent 01cc8b5ee415f0a79bfb1f69ad68f47732bfad21
author Ed Heyl <edheyl@google.com> 1414085113 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085113 +0000

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

* commit '01cc8b5ee415f0a79bfb1f69ad68f47732bfad21':