tree 879acde9cf9e2ffe51709c83b8fe9016f472cfbb
parent 128d3941bf30cce5a716f6d530ac5c9f97fe738d
parent 587be905460f85e28888fe54ccba9d17b105b018
author Bill Yi <byi@google.com> 1465010366 +0000
committer android-build-merger <android-build-merger@google.com> 1465010366 +0000

Import translations. DO NOT MERGE
am: 587be90546  -s ours

* commit '587be905460f85e28888fe54ccba9d17b105b018':
  Import translations. DO NOT MERGE

Change-Id: I35aa7a2ed7ff7fd821545190ac556aa5ced326e7