tree a8cf16e850a98e65129293b07e0968f9d1d2f0fb
parent d877f14834292c0ae24404b492c6f023667cd8a3
parent ae437bc6f283108807a620d680d9881f27c21cdb
author Bill Yi <byi@google.com> 1509346605 +0000
committer android-build-merger <android-build-merger@google.com> 1509346605 +0000

Import translations. DO NOT MERGE am: 0159791633  -s ours
am: ae437bc6f2  -s ours

Change-Id: I25d351a93ed47cfd7535c65aa083d22d5f077e31