tree 5be2e179877b5b734606cdd4cfb82e56ec009f3a
parent 62ddd96be46456868120cdaa33ca0dac46e1544a
parent 0c3f3ee2754103692f60aef24df13de9633dc7f7
author Geoff Mendal <mendal@google.com> 1458356235 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458356235 +0000

Merge "Import translations. DO NOT MERGE"