| commit | 1dc426c29b3c922b7f2fa6ed8be8e846190cbea6 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Jul 31 09:57:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 09:57:36 2012 -0700 |
| tree | 456484f164ae7f8d041004a34fc612c62e0b1dd7 | |
| parent | 65558d5d33c89454745239ee2eef84dcffe626ba [diff] | |
| parent | 400918b02d6939da5f939ec12bf07d6bd92bf829 [diff] |
am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev * commit '400918b02d6939da5f939ec12bf07d6bd92bf829': Change KeyStore to use Modified UTF-8 to match NativeCrypto