tree ffb64050202d1e3204ddcef82cfa71a430f6b9e6
parent 4cbedcc67937615981e9668fb10942fe8c3162a3
parent 9a4ff5a900468fc45a410010dd1ff622ca78c88f
author Bill Yi <byi@google.com> 1479691928 +0000
committer android-build-merger <android-build-merger@google.com> 1479691928 +0000

Import translations. DO NOT MERGE
am: 9a4ff5a900  -s ours

Change-Id: I19ed28ded9e92d54b060d0a944cf318a0f1a4984