tree c944e9e8584ebf58a309d63a0324db92f5ffa337
parent 377fd8c6c8ea345b19ea223a8368f8e8de3d6649
parent 1f4c6a44759b50184f0a337885430601af8c4ed4
author Bill Yi <byi@google.com> 1465838907 +0000
committer android-build-merger <android-build-merger@google.com> 1465838907 +0000

Import translations. DO NOT MERGE am: 83b18efa96  -s ours am: c2860718a4  -s ours am: d621f3a251  -s ours am: a221a84208  -s ours am: f3c80859ff  -s ours
am: 1f4c6a4475  -s ours

Change-Id: Ib5b381bba34c0f011c39985ab4fcb0f7df61277e