| commit | 96c702b1e4fba5f617b238d4c7ee4f6be261fff9 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue May 01 10:37:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 01 10:37:40 2012 -0700 |
| tree | 17dc44ada63388dd5a23c1619f5aa385a437e57a | |
| parent | a2799d4973e11c5f7c9b00d1bc61f31de463ce57 [diff] | |
| parent | a1630d9f1e92099b4b9f505f397af4ee885fea02 [diff] |
am a1630d9f: (-s ours) am 1f0f6c7e: Import translations. DO NOT MERGE * commit 'a1630d9f1e92099b4b9f505f397af4ee885fea02': Import translations. DO NOT MERGE