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

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