commit | 359658b9e2476062b62abaabc5106dbb50aa6602 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 08 19:19:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 19:19:03 2015 +0000 |
tree | 210189ffcc165ad72a40bb7a20a2326f13e863c8 | |
parent | 87c43346eb71ce5f3cd6d51dc6ed44652a425b71 [diff] | |
parent | 987922d81e2948707b23af8dd7608e0a710c6b46 [diff] |
am 987922d8: (-s ours) am 9e218eaf: (-s ours) Import translations. DO NOT MERGE * commit '987922d81e2948707b23af8dd7608e0a710c6b46': Import translations. DO NOT MERGE