tree 25e090f9cc465aea0761ee721fcde3aadf0f3556
parent 14c64f966a5839bc8b505bb290d393389873f718
parent e430622a4fffc0060d6ac9a3311d2b99fe30cc2c
author Bill Yi <byi@google.com> 1470420422 +0000
committer android-build-merger <android-build-merger@google.com> 1470420422 +0000

Import translations. DO NOT MERGE am: 8bc8d4d4f7  -s ours am: 8fdb88e42b  -s ours am: 3d376a2be0  -s ours am: 831cbc7d53  -s ours
am: e430622a4f  -s ours

Change-Id: I2ba35cb24606cf0e65cd9596ff889c4c18aa60c1