tree a7544610610eecc348d38f3262201f039cbf5234
parent fceb2818d6ca68796b4ac0b3e78dccd3b3fe6734
parent 1146d6375c7e430f690720d690caae574ec0e8f7
author Bill Yi <byi@google.com> 1476436976 +0000
committer android-build-merger <android-build-merger@google.com> 1476436976 +0000

Import translations. DO NOT MERGE am: 43920d3ba5  -s ours
am: 1146d6375c  -s ours

Change-Id: I973f3606e3f7427f74c9af29d58ba0611b865704