| commit | e003e7e8ca0bd697838ce48700d3fee8faf5110d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 20 21:05:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 21:05:50 2014 +0000 |
| tree | 395dec9ab1b065c3038f013b9f7628a888f483f0 | |
| parent | 63665f2ac4f25131728a7efff0a449ecdc3f4c50 [diff] | |
| parent | 5c43c35790663442935c901730b5a4403311f254 [diff] |
am 5c43c357: (-s ours) am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '5c43c35790663442935c901730b5a4403311f254': Import translations. DO NOT MERGE