Merge "Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable""
tree: 55f3305a68d5920c157fc779ae18d204662921ca
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE