| commit | 400918b02d6939da5f939ec12bf07d6bd92bf829 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Jul 31 09:55:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 09:55:30 2012 -0700 |
| tree | 4e7545bb37a905622ed2c232332779071dc85103 | |
| parent | 0af60dfc69e9cc11b8f8111a7ce657a74a0a4322 [diff] | |
| parent | 4881d8d3f12efc9bdb3b4c71d117a2c53919d258 [diff] |
am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev * commit '4881d8d3f12efc9bdb3b4c71d117a2c53919d258': Change KeyStore to use Modified UTF-8 to match NativeCrypto