commit | ea29ea73e004472ca3958087b7640bbf4715709a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Oct 17 08:44:12 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 17 08:44:12 2013 -0700 |
tree | 943a3fb03b1c5afa7f3c73533df4b896f00e19b8 | |
parent | a4483407e860cb69cd56dac0d27f62e85e6cdf05 [diff] | |
parent | fe8e29942069a2359dffd9d43da6912d78ddf95e [diff] |
am 12336a59: (-s ours) am c11c43ee: (-s ours) am b923efba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '12336a59adf77f5dd702ac03e89184a1cb2123e9': Import translations. DO NOT MERGE