am 847d956c: keep history after reset to klp-ub-dev

* commit '847d956c7099a0a39f190acfd4d8e86b571f65dd':
main
Baligh Uddin 2013-12-13 00:37:14 -08:00 committed by Android Git Automerger
commit 941b0226a5

Diff Content Not Available