commit | 29b23ab6844c5ecac0fd43349c2f95c6fa91af7f | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 01 05:36:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 05:36:35 2014 +0000 |
tree | af83d9a4aaebe9dae2d5e2c4a276ca0f5848bfb1 | |
parent | 328a9598fcbac1870cb9440c4c8edae0602e1764 [diff] | |
parent | 658bd9f8b06c6b8e5ba9f6e19be22bdfb94363c6 [diff] |
am 689e6871: (-s ours) am 8f4aeb00: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '689e687139c8ee0063ac2c9f1c03639a4450f0d2': Import translations. DO NOT MERGE