tree 2dfc04c3a2d47676f7981cf08a32fa8deaed1797
parent 61fecaff67a243278eb067bedc0915ee72b7887a
parent 46cff110002cff9c6709e2da43e1012c5be43732
author Bill Yi <byi@google.com> 1487008972 +0000
committer android-build-merger <android-build-merger@google.com> 1487008972 +0000

Import translations. DO NOT MERGE am: c342666ac8  -s ours
am: 46cff11000  -s ours

Change-Id: I09a6d85d1664b8842507fd550303775159520088