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

* commit 'd1b3dc5f636067f47fd1ec97d5ba89fd0ac9f710':