Merge "Add manufacturer and model to device ID attestation"
tree: 931e0a1d581b5c98ee63a83f161640878e6982c9
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE