commit | e54b83b0eec55e649d9308169902865991d6827a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sat Sep 14 20:32:13 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 14 20:32:13 2013 -0700 |
tree | cb963778923ae1e29c629bdf8d9bf3524aa72dc3 | |
parent | 2a0568b27be543f3f0ea46f0db4ea52fe7a31e11 [diff] | |
parent | 60772a576578436e012e9bda521b872b5a8c7eb5 [diff] |
am 60772a57: (-s ours) am d1a12c16: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '60772a576578436e012e9bda521b872b5a8c7eb5': Import translations. DO NOT MERGE