| commit | cccd683f1f8bb76f49ec6dbf757dfcd37d86f2f5 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Apr 04 15:00:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 15:00:02 2014 +0000 |
| tree | e8b3c644bd863cb946776aaf1a0cbfa7b4c70a3a | |
| parent | 10cbad66f97a58b67f31c7ddbebc13073355e0cf [diff] | |
| parent | 1c89073daee81ef5d3b4df89d9bcdd0a9daf01b7 [diff] |
am 1c89073d: (-s ours) am 87132265: (-s ours) am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1c89073daee81ef5d3b4df89d9bcdd0a9daf01b7': Import translations. DO NOT MERGE