| commit | 22871a15ec77accc70c52c254bc3fa4b3fc08b55 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 13:18:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 13:18:03 2015 +0000 |
| tree | 01d96c5cf89218c07acdec2e515e844732ea5ae2 | |
| parent | 8931367a9ba844fe60e8dc2a582bebbd7549c876 [diff] | |
| parent | 338b91f53007c908b5b3b44d2c9aa0c9b4e98fe7 [diff] |
am 338b91f5: (-s ours) 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 '338b91f53007c908b5b3b44d2c9aa0c9b4e98fe7': Import translations. DO NOT MERGE