tree c8a75b710fa1d7eae43a4e2af85244b6b7dbb036
parent fe84caad611ce7f672919e13e6f01e136eab5d69
parent 38eacb297a399650432fb1e61a5642fb8c25a800
author TreeHugger Robot <treehugger-gerrit@google.com> 1497302683 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497302690 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev