am 0b1165c0: am 29542143: Merge "Document the security features of Android Keystore." into mnc-dev
am 0b1165c0: am 29542143: Merge "Document the security features of Android Keystore." into mnc-dev

* commit '0b1165c046b7787b9ed1c2bee1537a9adf51cbe7':
  Document the security features of Android Keystore.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base