tree 2406fe8280cf92fb931fa11c7e69e351249326c5
parent d19aba43cd7f0204fafcd2af8c69df8436b4ce44
parent bb7bad413a169ab1c70552b2b6d38299dfb2eb6f
author Bill Yi <byi@google.com> 1479694319 +0000
committer android-build-merger <android-build-merger@google.com> 1479694319 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 81abcfea7b  -s ours
am: bb7bad413a  -s ours

Change-Id: I82a6ab8827a3b8416d797493f07f0b036af8d4ea