am 555741ae: (-s ours) keep history after reset to klp-dev

* commit '555741aef7ae96071884a65cfb2c82a9e907603b':
main
Baligh Uddin 2013-12-13 00:37:06 -08:00 committed by Android Git Automerger
commit f2050bbe97

Diff Content Not Available