tree d1c277577a341c19a8c34325203dea3dc15a9a3d
parent 8576c345e78002c9cc2d52d91ce6043214857608
parent e97b97049b21f2e2f2610615ff57d00a34f01294
author Bill Yi <byi@google.com> 1493220414 +0000
committer android-build-merger <android-build-merger@google.com> 1493220414 +0000

Import translations. DO NOT MERGE am: 7e07755349  -s ours
am: e97b97049b  -s ours

Change-Id: I7523a4c1135529fd8cf5400973955e344f3b051d