| commit | e565f62ccffa9548f006df11898ec68e252392de | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 10:12:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 23 10:12:36 2013 -0700 |
| tree | 3f14275ae75c8ee0009eb24c1a80e89915f2ef54 | |
| parent | e5110fd4c21fcf6dfe3253d989d40b747d8e7ef7 [diff] | |
| parent | b2b02c56a01dc8b164ed41109e074b44676e34d2 [diff] |
am b2b02c56: Merge "Fix test fallout from the switch to canonical encoding names." * commit 'b2b02c56a01dc8b164ed41109e074b44676e34d2': Fix test fallout from the switch to canonical encoding names.