tree 55d3ef145d9df5aa7b832e11f1e4c6ff83fc12b8
parent b287250e36f8fd1eee0a67a64175f0cb03d877a6
parent c967ede5c83e039d0484f62097a29eb00e0c6d6a
author Bill Yi <byi@google.com> 1478893470 +0000
committer android-build-merger <android-build-merger@google.com> 1478893470 +0000

Import translations. DO NOT MERGE am: b8aaaa8949  -s ours
am: c967ede5c8  -s ours

Change-Id: I8ebb662bfa9ad1a4e1b3ef14d9f221e5aadf6c69