tree 478431d62e61d0e2821a802c1a06b7afd8f74c6f
parent c9d83fc2e0f2e6f24b9f7957cc9650b3e866cf1d
parent bbf3cc5797293dc915d7ecfe41e85bbe5682548d
author Alex Klyubin <klyubin@google.com> 1428600676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428600676 +0000

am bbf3cc57: am fd168151: am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."

* commit 'bbf3cc5797293dc915d7ecfe41e85bbe5682548d':
  Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.