tree ff54f38941a5cc56c16c481235ac6cae00c08658
parent 0c4e13b41dfb7b671090f61601c3037c0fccb4bc
parent 14bfbca598f637b3e75c8ce8e583a399fa8bc6af
author TreeHugger Robot <treehugger-gerrit@google.com> 1497627006 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497627011 +0000

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