| commit | 72edb1b78d0316055b40931138ee75a99766995d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:09:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:09:54 2014 +0000 |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 | |
| parent | 21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad [diff] | |
| parent | 699991c8a296834e8fe843bce85529b018d12af8 [diff] |
am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '699991c8a296834e8fe843bce85529b018d12af8': Import translations. DO NOT MERGE