| commit | 7786687e7eb17c7670dacb08eca3346a945232aa | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Aug 02 14:56:59 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 14:56:59 2012 -0700 |
| tree | 2a7b6acb2ecc1e169f51ad96fd85f90aa55e58eb | |
| parent | d9ea9c985147ec019f84ac6ae4c42cc08fd22768 [diff] | |
| parent | 4040fccdddcc4669b01979572c8289b2d674a711 [diff] |
am 4040fccd: am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" * commit '4040fccdddcc4669b01979572c8289b2d674a711': Change KeyStore to use Modified UTF-8 to match NativeCrypto