commit | dbb9f370b2ebc5f1f0276fd0af2f4bd93ab25594 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:42:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:42:45 2015 +0000 |
tree | 27538a6101c75339440c743ff698bddea7539dc9 | |
parent | 514650d8a6283694e6050b5aca69cd543e1dfa06 [diff] | |
parent | 0010f09a52532244939221392e8bf649cf0794ed [diff] |
am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '0010f09a52532244939221392e8bf649cf0794ed': Import translations. DO NOT MERGE