tree 8f813e61865806b5a6fa03b932074c2ebe238e6a
parent a38b6d495376312fbc4d3ad7edc119fc078af2c3
parent 7ab0a985aeebd01eb0507df1b1bc99ca717cd31b
author Bill Yi <byi@google.com> 1475134823 +0000
committer android-build-merger <android-build-merger@google.com> 1475134823 +0000

Import translations. DO NOT MERGE am: e930d5a5f4  -s ours
am: 7ab0a985ae  -s ours

Change-Id: Ic929db922d61f1cc29c9765b2786d0af5edfdd9f