tree 2c5744a09faef87448aa727ff2efefbcd49a5d46
parent c713fab146121b17f66b4818953c651b360e803d
parent 946bdfb21427a2b35ddcd9e2acdb75c2d1686f35
author Bill Yi <byi@google.com> 1512075353 +0000
committer android-build-merger <android-build-merger@google.com> 1512075353 +0000

Import translations. DO NOT MERGE am: 059c2c8f13  -s ours
am: 946bdfb214  -s ours

Change-Id: I989f2e3a26ab267bcbd5e1d22d07a7eb201b676d