| commit | 31e82e7e0f6ffe5c61cfba8288b6e5c50a4a7bc4 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Mon Jun 25 14:27:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 25 14:27:19 2012 -0700 |
| tree | 297283387c0e3461c963e7226b68843b9fd9987f | |
| parent | 43d9b7818b6ba1cb82642ba9f2ad3513b74ee9e5 [diff] | |
| parent | 67727e34a28e3bfe3f331733b9d1e3c78294e793 [diff] |
am 67727e34: (-s ours) am 04f0b211: Import translations. DO NOT MERGE * commit '67727e34a28e3bfe3f331733b9d1e3c78294e793': Import translations. DO NOT MERGE