commit | b30d376800e717b2d6f33f97fe074c4f2de4aa0b | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Mar 25 14:28:45 2014 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 14:28:45 2014 -0700 |
tree | 20ba5c1ee8d77011e64ed79df0a275448c5be3a4 | |
parent | a8f48bf6a30a1f161e2292edff038c19691defe6 [diff] | |
parent | 46a345c9e987d964b61d86bbd79039830fa8f247 [diff] |
am 85e7278f: (-s ours) am 5d72e05a: (-s ours) am 8258f111: (-s ours) am 904dde27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '85e7278fec5a71115db7bb0be7e2f4e7d20b0452': Import translations. DO NOT MERGE