tree 258d21ae881368d2f4b2ed2ca79c2d02e2cb5d40
parent 82f805ba717e7d667d37e174a7282d72d6a359c2
parent 6d3a0f1321b9b273c8bd89818b1d5ef73d414cc8
author Bill Yi <byi@google.com> 1493982386 +0000
committer android-build-merger <android-build-merger@google.com> 1493982386 +0000

Import translations. DO NOT MERGE am: 6a765bc8b2  -s ours am: 1eaf75cd1b  -s ours
am: 6d3a0f1321  -s ours

Change-Id: I04d5bcb0d20f1146de1b43a5ed18d57c566ce9f3