commit | 101cdca729902a80a89c5305e226630e2129bbe4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:50:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:50:51 2014 +0000 |
tree | 0ac6f3de57b910e0efcceb03525fc312a3862975 | |
parent | 69d3d33fb0baeed6b93fc7f28c7a9a042f345361 [diff] | |
parent | 965048d992af142a3314726b738d43a96aec3764 [diff] |
am 965048d9: (-s ours) am 2ffe6a23: (-s ours) am d25f8443: (-s ours) am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '965048d992af142a3314726b738d43a96aec3764': Import translations. DO NOT MERGE