tree 1ea03cb194febeb16435fc50341509a3a5172ee5
parent 98c97c893252094bf118fb436fe92950148f120d
parent 1957b47349bf8d2a61ad2aa3e319597cfc72c44b
author Bill Yi <byi@google.com> 1466138627 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466138627 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master