tree 9ecf08449c7596b2885b46a5163756e9cbb9ec39
parent bf6e01ced5a2d04bbdd7cdde86bd370f86865739
parent 3c654c199ed788663b3c216f81ad71cbfa288507
author Bill Yi <byi@google.com> 1469765548 +0000
committer android-build-merger <android-build-merger@google.com> 1469765548 +0000

Import translations. DO NOT MERGE
am: 3c654c199e  -s ours

Change-Id: I509897896e4a9930da187f4f2270050063073d46