tree 1678aa1dde998d320e62cdfd2b1783f111b5379b
parent 803bbf9a6d92f487cea956758d344a9f1778e953
parent 7f1e3740b4f63883e3bca11a4557c2d24fc3b84b
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: 7f1e3740b4  -s ours

* commit '7f1e3740b4f63883e3bca11a4557c2d24fc3b84b':
  Import translations. DO NOT MERGE

Change-Id: Id75929d90076ceb69f7105cbf3dcccffd42b962c