commit | 5b20420652fe8ed921769cbb3b5e7361fa5387b8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Aug 24 16:55:05 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 16:55:05 2015 +0000 |
tree | 34daf2a2a25b80887e6437da3a790a887c5d0546 | |
parent | 8c0104ef9fe5152c742a456c564c6588878e7645 [diff] | |
parent | cca7c4f945f4bf1bc2e8d0116d2248898abb2472 [diff] |
am cca7c4f9: (-s ours) am 92f43c8e: (-s ours) am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE * commit 'cca7c4f945f4bf1bc2e8d0116d2248898abb2472': Import translations. DO NOT MERGE