Merge \\\\"Fix google-explicit-constructor warnings in keystore.\\\\" am: 590a1dade7 am: d62c7277dc am: d47b035da4
am: bf14d3e04b

Change-Id: I981886ee3c85482854ec4ceda210dc48786bc59b
tree: 970f7382960c384acca1172ffd342bc46099cf00
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE