tree b6885b67138f0e206ba7b1ead35adcf621d5bc99
parent d3107a953d57706146c0aab0cc3ae5615d4ee1ac
parent df847f9362c42660105329b51835b8a9bc7619e5
author Bill Yi <byi@google.com> 1502085825 +0000
committer android-build-merger <android-build-merger@google.com> 1502085825 +0000

Import translations. DO NOT MERGE am: 34e87e78a0  -s ours
am: df847f9362  -s ours

Change-Id: If4b113f578f0aabcab84ea623ec0e516b016eb04