tree b1d9676240ac3bcd9f13a1ce19fedff326019be6
parent e48f62c7a3ab729689f0ce9e9ead57910896567c
parent 54fe662f5d29780b2330b9ed2bf4af8a12476bdf
author Bill Yi <byi@google.com> 1486111075 +0000
committer android-build-merger <android-build-merger@google.com> 1486111075 +0000

Import translations. DO NOT MERGE
am: 54fe662f5d  -s ours

Change-Id: I2fc0be5f561ccd9cf83c6d558f9037fca2d2d8fe