tree 9ecf08449c7596b2885b46a5163756e9cbb9ec39
parent 8577a17791a1914e4f9f44d0c2071b6d958aae6e
parent 6c5025a9f53cca2b8ab6f2b2c2902dec1656e0fb
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: 6c5025a9f5  -s ours

Change-Id: Icc53bd9754405e04fb6e639afae16c3ea805738c