commit | 39663d599b918b5f092a26d63f25df29864c66e3 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sat Sep 20 05:04:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 05:04:46 2014 +0000 |
tree | 7d39ecb4b9fdf85b14130aa47413f8668093ba14 | |
parent | 88cae78f60fce854cbd59b334632891439378176 [diff] | |
parent | 0d3bcde702f58aa4c1c0379937d8b8dc35c2bc4a [diff] |
am 0d3bcde7: (-s ours) am 2301416d: (-s ours) am ed04bd9e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0d3bcde702f58aa4c1c0379937d8b8dc35c2bc4a': Import translations. DO NOT MERGE