tree 4522b11f5eb50d46834eeedc063d3389c68178cb
parent d575e7210a2c2c877711b4b5fb36eed1ab63672b
parent f1d2140d1a4803257b78537ed0735dc540089669
author Bill Yi <byi@google.com> 1461718508 +0000
committer android-build-merger <android-build-merger@google.com> 1461718508 +0000

Import translations. DO NOT MERGE am: ca5003e  -s ours am: 97ee2b1  -s ours
am: f1d2140  -s ours

* commit 'f1d2140d1a4803257b78537ed0735dc540089669':

Change-Id: Ib205726a79bf6f8a5b37f98bac5a1f54afbabcdc