commit | 338b91f53007c908b5b3b44d2c9aa0c9b4e98fe7 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 14 13:12:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 13:12:54 2015 +0000 |
tree | 9455cde495d658f78e2d561a60a374b59c021595 | |
parent | a1641e814370f0f2bdfb241de249f9a8e10200a9 [diff] | |
parent | 9535c47beae13a0b4e9738ab84c6f7ff649ca76d [diff] |
am 9535c47b: (-s ours) am 107baf55: (-s ours) 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 '9535c47beae13a0b4e9738ab84c6f7ff649ca76d': Import translations. DO NOT MERGE