| commit | 9015ccfcae497ab14dfac0ad8e1c1de3ee7acaa1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 01 10:05:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 01 10:05:47 2013 -0700 |
| tree | 32d793005c345ffd61c29480007bbaa4abd4d41b | |
| parent | 6a844844e7ef3ff6ae3d686571cb62eca62c1440 [diff] | |
| parent | 65468cb547f654afbdb00182f3a9f3f509b0d08c [diff] |
am 65468cb5: am 844501b2: Merge "Switch NFC over to the public StandardCharsets." * commit '65468cb547f654afbdb00182f3a9f3f509b0d08c': Switch NFC over to the public StandardCharsets.