tree 2406fe8280cf92fb931fa11c7e69e351249326c5
parent 8ac46e4ccd9e8cce85df7743b4b490ffd2c0d6fd
parent 610d943dd6293256b4f30d19cbc68cf6741a8e30
author Bill Yi <byi@google.com> 1479692672 +0000
committer android-build-merger <android-build-merger@google.com> 1479692672 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d0220f7863  -s ours
am: 610d943dd6  -s ours

Change-Id: I32cb631e3fc22caaad64403f3a13852b0d9ec18e