Merge "Add keystore to AID_READPROC" am: 641c6299e5
am: 0768b9943c

* commit '0768b9943cc0b4f8377eafb9486f4f17177378ed':
  Add keystore to AID_READPROC
tree: 16f2fc1121af80d1fa3254104fe3fba824638b01
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE