commit | 5e1b4a0c8301716bd20fa172db523013e7b698bd | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Jan 06 22:36:10 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 22:36:10 2015 +0000 |
tree | 6e28d35dbd44464f3377f172f83ed25bb538e0af | |
parent | 7aa9d752c8cb5cfb9eeeeec23f53d1ad8ea271c2 [diff] | |
parent | efc0bbecc5dad6e1ac78b39b4f6f0c7f943d2b25 [diff] |
am efc0bbec: (-s ours) am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'efc0bbecc5dad6e1ac78b39b4f6f0c7f943d2b25': Import translations. DO NOT MERGE