commit | 107baf5504d938828b5212eb1bbb06e36945ae49 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 14 13:04:12 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 13:04:12 2015 +0000 |
tree | 41465293c3cb8ccc9852f176898119809bc8e832 | |
parent | 54158bc74debbe76637077cb354d910cfcf8ef01 [diff] | |
parent | 0884f09acf51b2187abc5ec038590726f6923b29 [diff] |
am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE * commit '0884f09acf51b2187abc5ec038590726f6923b29': Import translations. DO NOT MERGE