tree 1678aa1dde998d320e62cdfd2b1783f111b5379b
parent 2457bad7c52a6a8ea3fe33cd52b006062e34008e
parent 69ac5028c49c8050aa85ccfa52a0baa5e32de1ca
author Bill Yi <byi@google.com> 1465142270 +0000
committer android-build-merger <android-build-merger@google.com> 1465142270 +0000

Import translations. DO NOT MERGE am: 58d444ff5f  -s ours
am: 69ac5028c4  -s ours

* commit '69ac5028c49c8050aa85ccfa52a0baa5e32de1ca':
  Import translations. DO NOT MERGE

Change-Id: I6a259330337b74c47724b9cf7b60f79c644e02af