tree bd2ab01edb54ddfe91e58959ad41704a61075a58
parent 8f2f4ad42d0de986fb803e68e878c70301ab2b4c
parent 4095f560e99340241b4f659fcae5548675d96e53
author Bill Yi <byi@google.com> 1486110951 +0000
committer android-build-merger <android-build-merger@google.com> 1486110951 +0000

Import translations. DO NOT MERGE
am: 4095f560e9  -s ours

Change-Id: I18555ebbe9ec6a948797332894d4c6afb395a1d3