tree 6c871891b01af459f61f2ac887c32d08aceb0ae4
parent 383f86836adc0fafdf2d286d40f5dd43b24290bc
parent 0fe66d46ae4b1bcaa2c9d7cea5a45f0d0b1b0a4d
author Bill Yi <byi@google.com> 1474538190 +0000
committer android-build-merger <android-build-merger@google.com> 1474538190 +0000

Import translations. DO NOT MERGE
am: 0fe66d46ae  -s ours

Change-Id: I1893eda4c98c2f8c1e88344b026ea94819654b47