Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD am: 46fbb2b5df
am: d9944fa828

* commit 'd9944fa8282a8614ad65d65196d06f0380901484':
tree: 50392834de057649fe1041a9c10d292ae64d2377
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE