tree 6407a941ee59579d9685f8cb4c573736044b1931
parent 370af158e9908cd1e3210e344a0d758ff1b24471
parent 45215ab25ba599a360d72500b2b95e3e6bafab8f
author Bill Yi <byi@google.com> 1467779820 +0000
committer android-build-merger <android-build-merger@google.com> 1467779820 +0000

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

Change-Id: I29d78230052fb90e466fcb8c5e954330e05216a8