| commit | 7138e5e03f3709c0912947fa9108c510f25a1497 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 22 09:34:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 22 09:34:16 2013 -0700 |
| tree | d6e3b71a2e7687973a866e6fe8c4952f41e6b1e1 | |
| parent | 8363be7e61d1a0bb39dd76fbebc948a1fcfc8c39 [diff] | |
| parent | 17e01a2985ec67f411927aaea1ab144ecdbfa24e [diff] |
am 17e01a29: keep history after reset to git reset to 6811c5a414a15fa34b4f6917c3f250b3498a89ed * commit '17e01a2985ec67f411927aaea1ab144ecdbfa24e':