| commit | 6e7affeb3d0d026db20690072d8a661847888a42 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jun 28 16:53:27 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 28 16:53:27 2013 -0700 |
| tree | 9033ab74461abe80612a6cea6aa99c03db2a2f5c | |
| parent | ebb77f55a9f82ea7e8737d654dd87ad57dd5f5b9 [diff] | |
| parent | b8292830f79fc76ffb9a1be5cd316212ac494d03 [diff] |
am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp * commit 'b8292830f79fc76ffb9a1be5cd316212ac494d03': Switch frameworks/base over from @hidden Charsets to public StandardCharsets.