am 5e11efa5: keep history after reset to klp-volantis-dev

* commit '5e11efa5152d3bb822ed80201402762db8d797f1':
main
Baligh Uddin 2013-12-13 00:37:23 -08:00 committed by Android Git Automerger
commit 07e2b6b865

Diff Content Not Available