OSDN Git Service

am 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API."...
authorAlex Klyubin <klyubin@google.com>
Fri, 15 May 2015 18:51:48 +0000 (18:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 18:51:48 +0000 (18:51 +0000)
commit90c1c454e4f313d152156a7c2b3e146bb56382f4
treee65e995ad517663e5a1ff182a74b6b255f5b3d8b
parente0b108cd951f3b6db13b562a5035f22fa1cbd961
parent6a5f85080e1a3656fc9a4a22c71cf7bc1f9239de
am 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev

* commit '6a5f85080e1a3656fc9a4a22c71cf7bc1f9239de':
  Remove "encrypt at rest" flag from new AndroidKeyStore API.