tree 5d434befc14cb3339197b9eddfe784cc434ea58e
parent fb64fe1b6ed02f9e52694029f1efe47665353d48
parent d2237dfe7d84c36e5cc9399a444f9befb559af97
author Brian Carlstrom <bdc@google.com> 1343928733 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343928733 -0700

am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"

* commit 'd2237dfe7d84c36e5cc9399a444f9befb559af97':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto