tree bdf2ccff92fac03b4f806e26d439dfeb9d3e247c
parent e6b916e63fa0f7d80afc8a8529f1d92f503168e7
parent d67cd7d757c603340aa2c7d732eb30833e316536
author Bill Yi <byi@google.com> 1470781993 +0000
committer android-build-merger <android-build-merger@google.com> 1470781993 +0000

Import translations. DO NOT MERGE am: 5403c74434  -s ours am: 0d92f75de4  -s ours am: 29bbea374c  -s ours am: 2d0cac8d0c  -s ours
am: d67cd7d757  -s ours

Change-Id: I1bcc78253cccfdd2f44b014e5002be8d997a27b7