commit | 05db7242b8a2232daf32d3f93d5bb4b8c4bb06c6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 01 05:44:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 05:44:46 2014 +0000 |
tree | 1456185adbaa7d68394d0c413bee1dd7af6cd95f | |
parent | 0050c8a51ce1ac9cc18d617b243d6624b77b1044 [diff] | |
parent | 29b23ab6844c5ecac0fd43349c2f95c6fa91af7f [diff] |
am 50c780ea: (-s ours) am 689e6871: (-s ours) am 8f4aeb00: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '50c780ea2e497263413efbac91cd06d4bff53b4b': Import translations. DO NOT MERGE