tree 48fd200b3b18d102215d4d799de7d540534c1c17
parent 2d837a6e51f6fe7e7f0ecb1052b623bd3fc830d9
parent c5a329d7cf064ffe2bf292a7674297c03159c936
author Bill Yi <byi@google.com> 1474082274 +0000
committer android-build-merger <android-build-merger@google.com> 1474082274 +0000

Import translations. DO NOT MERGE am: 8a18ea0a1d  -s ours
am: c5a329d7cf  -s ours

Change-Id: Icf7ae04a65dab7029e1e2c4a140cb9b92f7cc71e