commit | ebfddeacf5d0c317735527de67f4a8b8d537f2e6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 20 14:12:16 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 14:12:16 2015 +0000 |
tree | fbe4957648f09954fff529720a01adc3c83207cc | |
parent | a43761755bb74fb56f21d70b877705ca3fa8b01a [diff] | |
parent | 3f287849a9844cb2f9072cf0f135a20a14eefa72 [diff] |
am 3f287849: (-s ours) am 1bb57890: (-s ours) am 8eae5068: (-s ours) am 69a7483e: (-s ours) Import translations. DO NOT MERGE * commit '3f287849a9844cb2f9072cf0f135a20a14eefa72': Import translations. DO NOT MERGE