tree 04a2e0b13f803518009635d57eda42090a7a47c9
parent 69610f0a65595ed14eff2b33775b390728880329
parent 2480a0f4e10fcbcebb203d0a1f89c8613a80559f
author Bill Yi <byi@google.com> 1508218365 +0000
committer android-build-merger <android-build-merger@google.com> 1508218365 +0000

Import translations. DO NOT MERGE am: 634dc1fdf2  -s ours
am: 2480a0f4e1  -s ours

Change-Id: Ifa2a8b2b10f442be6eb4624e938fa0878d2c433a