keep history after reset to mnc-dr-dev am: d1b3dc5f63  -s ours
am: de4e6af56d

* commit 'de4e6af56d25d0cfbbed736f6f125e5c6aac4d58':