| commit | c355d63a800b63d6ce75f0b4f5ee7ecd363ce282 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu May 31 15:57:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 15:57:13 2012 -0700 |
| tree | b71217c559be3ec7b9afafb1dd30a052fc67449a | |
| parent | 80f9931af15aebc7be6a6d2e326ce16631c6bb2a [diff] | |
| parent | c720651001117d67f4aca62350979b2854a88de5 [diff] |
am c7206510: (-s ours) am ca8c001f: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'c720651001117d67f4aca62350979b2854a88de5': Import translations. DO NOT MERGE