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

Change-Id: Ia1a96205e17559513f074369163417b7f87c5472
tree: a2eb3c7fed47cbf730489c621daea90af2808853
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE