am e60d947c: keep history after reset to klp-dev-plus-aosp

* commit 'e60d947c1fbac3e2c2ff9c1e4f600895390351cb':
main
Baligh Uddin 2013-12-13 00:37:18 -08:00 committed by Android Git Automerger
commit 2efeae27ef

Diff Content Not Available