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

* commit 'de4e6af56d25d0cfbbed736f6f125e5c6aac4d58':
tree: da484267ab96b7b0bd3dfc05676dad44783f0ef4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE