tree ad34c54fb5ac2c1e8238be405c1979e714e37d5c
parent a6a8c557e70b872c721c416d109ae8dd6797ae44
parent 85e8e551d55ac09ca4bc1ca093d3eb95f78d170d
author Bill Yi <byi@google.com> 1466139463 +0000
committer android-build-merger <android-build-merger@google.com> 1466139463 +0000

Import translations. DO NOT MERGE
am: 85e8e551d5  -s ours

Change-Id: I17c0f8d8965e0061da18f22774fbc83f249c765a