| commit | dd27d2c6bff016ac5bff36d1f60bd7537ce0f730 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Dec 17 23:04:39 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 17 23:04:39 2012 -0800 |
| tree | db7296db2019b7b31e17ace2d9b3a35fe20fe59b | |
| parent | ccc9a8a954907c4308d22846569801f17badd466 [diff] | |
| parent | cfc7adfb1ec08355a248e10c4694e1d93bedc03f [diff] |
am cfc7adfb: am b6982bf7: am 1dc426c2: am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev * commit 'cfc7adfb1ec08355a248e10c4694e1d93bedc03f':