commit | 982c75c321a61de18a14de201b6bad6ab36d0682 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Nov 19 18:05:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 18:05:24 2014 +0000 |
tree | 6fbfc9a36c53a4702a7fd4ab71a50ec1dbe4bc72 | |
parent | ecd5556114bdb79e6d4d30c6761cbee3c62e22a9 [diff] | |
parent | 88a080bc68de7590c4ee1bc69fa9dbd40f6a9055 [diff] |
am 88a080bc: (-s ours) am 5b95c755: (-s ours) am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE * commit '88a080bc68de7590c4ee1bc69fa9dbd40f6a9055': Import translations. DO NOT MERGE