tree 04ced860df565760b1e1fe82f19288ee99870e29
parent 125db74f71383e8c823fd4588ce7dd2d04a046e5
parent 215732141fee6ed33e93683779c6f5277d4c2290
author Bill Yi <byi@google.com> 1477378880 +0000
committer android-build-merger <android-build-merger@google.com> 1477378880 +0000

Import translations. DO NOT MERGE am: a6d9842695  -s ours am: c027907edc  -s ours am: f8032d0b15  -s ours am: 79d7ca6010  -s ours
am: 215732141f  -s ours

Change-Id: I2ba7f73c60709970f2aa3710b8214bda9d82b180