| commit | 88f55cd1ea6913c8dd91f3fc8f254459c0bea4d5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 10:18:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 23 10:18:47 2013 -0700 |
| tree | 10bf71e329c9e6c8dc7b5bb133e0f91c06d11f6c | |
| parent | 8bb7bbad12d79f01c00cab515ecd290d560bd7f9 [diff] | |
| parent | e565f62ccffa9548f006df11898ec68e252392de [diff] |
am e565f62c: am b2b02c56: Merge "Fix test fallout from the switch to canonical encoding names." * commit 'e565f62ccffa9548f006df11898ec68e252392de': Fix test fallout from the switch to canonical encoding names.