commit | 4dee4e1cb394b077174ee29656bde962502555de | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Nov 18 10:53:25 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 18 10:53:25 2013 -0800 |
tree | 05cfb3bba8f4dc9e9e79cba400b8085a49d46099 | |
parent | 2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5 [diff] | |
parent | 35fb6cdf14549dac07585ae791b27e2c069bf176 [diff] |
am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '35fb6cdf14549dac07585ae791b27e2c069bf176': Import translations. DO NOT MERGE