| commit | c038cd95b9c5b76742cac4ff1cb36423b28f5d28 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 23:01:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 23:01:43 2014 +0000 |
| tree | b937df385a408d0709170f3f5b4252a38c22c96c | |
| parent | 72781426604697516c5c726e01750d919da66da8 [diff] | |
| parent | e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a [diff] |
am e16fe1aa: (-s ours) am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a': Import translations. DO NOT MERGE