| commit | f5570908a5acc1f68128c974abcfb0117a44589d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 19 00:25:00 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 19 00:25:00 2013 +0000 |
| tree | 9a44ea6b7824609363ae04ec9de7c16370fdba5d | |
| parent | cdbf1e0c5bc133cd4f8f8d6e86c28eabc0812730 [diff] | |
| parent | 53ca3018beb1a7a12d12cddfbc433d50ca793cf9 [diff] |
am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '53ca3018beb1a7a12d12cddfbc433d50ca793cf9': Import translations. DO NOT MERGE