tree 996ccf841bbef7e53920391c94ba9b37a10e3393
parent 9a4b5e64b82e0b4a661decfe18d2fb9fd045696d
parent 7f4ded6b14b3d0ed97cc367bb9b0437c340b87ae
author Bill Yi <byi@google.com> 1467780153 +0000
committer android-build-merger <android-build-merger@google.com> 1467780153 +0000

Import translations. DO NOT MERGE am: 271f042229  -s ours am: 45215ab25b  -s ours
am: 7f4ded6b14  -s ours

Change-Id: I2cacfd33eb554e4d14c6bd6dfeae55af395dad4a