| commit | f8465c8d2b96fdca29a878ce612e21f320c35dc2 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Dec 17 23:47:11 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 17 23:47:11 2012 -0800 |
| tree | ac76b054dd2e2c2858f0e179c16b419f44247b89 | |
| parent | 5d4b9b10a0c0cd934a7a9d7077b3879943346381 [diff] | |
| parent | dd27d2c6bff016ac5bff36d1f60bd7537ce0f730 [diff] |
am dd27d2c6: 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 'dd27d2c6bff016ac5bff36d1f60bd7537ce0f730':