tree b6885b67138f0e206ba7b1ead35adcf621d5bc99
parent 3877b31f6efa5be76f9147102157995f7adb60b7
parent 04e2d0ccfb4a1771a76748a333b3ba91b747f83e
author Bill Yi <byi@google.com> 1501901444 +0000
committer android-build-merger <android-build-merger@google.com> 1501901444 +0000

Import translations. DO NOT MERGE
am: 04e2d0ccfb  -s ours

Change-Id: Id8c98a8ff707cd497f631387aa87c1983f704f90