tree 048bc62587b795677f5180da6b354753c6adeca5
parent b9600e9dba63a7b99a83d2847a4447038a797365
parent 2da4c336ecac07e2af23950b4130ab11430e9e60
author Bill Yi <byi@google.com> 1465838187 +0000
committer android-build-merger <android-build-merger@google.com> 1465838187 +0000

Import translations. DO NOT MERGE am: 07edcb65d1  -s ours
am: 2da4c336ec  -s ours

Change-Id: I213a5bba5f2b879e46259d5516ad83457e2c2503