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