| commit | 7a41938fcc0d3c712516687e66f900569eb2801e | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Mon Jun 11 11:44:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 11 11:44:25 2012 -0700 |
| tree | 819d8c1c0c5f92927b02148a2cdba859e1ae4c08 | |
| parent | b0ce52cb280843052965f43768067d211baeb139 [diff] | |
| parent | b1f5446e93629ac59ad0cf8c9aebb269a6fa3cd2 [diff] |
am b1f5446e: (-s ours) am 6d73d8a6: Import translations. DO NOT MERGE * commit 'b1f5446e93629ac59ad0cf8c9aebb269a6fa3cd2': Import translations. DO NOT MERGE