| commit | c0317ea39f8989ed7d41d49bef271baa20a8246c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Jun 21 17:01:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 21 17:01:57 2012 -0700 |
| tree | 8a67679b9603a156730e4120e11e4ae723f2034b | |
| parent | 142d6bb377966ea573702e4a202ee47a5d0f7c9b [diff] | |
| parent | f3e54e100687a1c7d33ce98acc248aa553e03d1d [diff] |
am f3e54e10: (-s ours) am f44adb18: Import translations. DO NOT MERGE * commit 'f3e54e100687a1c7d33ce98acc248aa553e03d1d': Import translations. DO NOT MERGE