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