Merge "KeyCharacteristics implement Parcelable interface" am: 386ee11839
am: 468ddcb585

Change-Id: Ia61cbbe635e5c9cfdac7304e3c47678de254b42d
tree: 0d77e8c91c3b6786470cc0c4d3a940bf8188b3bf
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE