tree 2406fe8280cf92fb931fa11c7e69e351249326c5
parent baa88a8a4053023e64064e4576ba75426559b6fd
parent f9bdf27124df909e8c9ca6309d86dab8560ae880
author Bill Yi <byi@google.com> 1479693433 +0000
committer android-build-merger <android-build-merger@google.com> 1479693433 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c3ba50cc48  -s ours
am: f9bdf27124  -s ours

Change-Id: I1face0bfe1f87a4f8467784b082cf47a01c9d1b6