commit | 81b80ec790eb52e9d5a390e6f990d15fcaf803af | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:25:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:25:50 2015 +0000 |
tree | d8e760af78c3f8f1471a0653cceba451639393ed | |
parent | dea958db4beac1de8efcdfd448ec172ada1828a9 [diff] | |
parent | a467ef272a58e0c4c65c1eac51f6e7f244160fb5 [diff] |
am a467ef27: (-s ours) am 7c3b54a5: (-s ours) Import translations. DO NOT MERGE * commit 'a467ef272a58e0c4c65c1eac51f6e7f244160fb5': Import translations. DO NOT MERGE