tree 9a61af4c9e0e6322e86a1adfd0ae4315e65ff188
parent 1ae3aa2608074625889f3e6daf1e1473c9562660
parent ea329ca23ab0cb2c529b045352dc948a30d4e6bf
author Bill Yi <byi@google.com> 1464974661 +0000
committer android-build-merger <android-build-merger@google.com> 1464974661 +0000

Import translations. DO NOT MERGE
am: ea329ca23a  -s ours

* commit 'ea329ca23ab0cb2c529b045352dc948a30d4e6bf':
  Import translations. DO NOT MERGE

Change-Id: I5335e86b615e0e9b75572fea4cdd86b51300eba2