tree 5441efea51ef8743323b3719967de3c031e060ce
parent 604e7bf03d7aaf6240164952750edccb8d431726
parent ea329ca23ab0cb2c529b045352dc948a30d4e6bf
author Bill Yi <byi@google.com> 1464974930 +0000
committer android-build-merger <android-build-merger@google.com> 1464974930 +0000

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

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

Change-Id: Ib1aef6351aa26030b5a49940bf29480c9f45c137