tree de2ee0242d3567471af45320cd86804f73eec3ac
parent 6e7aaac79206a95ffc17c0bb70da5479a734cdc7
parent 836e99036ce3b3b82e55b7cb0a6adb4c596bcdde
author Bill Yi <byi@google.com> 1461789470 +0000
committer android-build-merger <android-build-merger@google.com> 1461789470 +0000

Import translations. DO NOT MERGE
am: 836e990  -s ours

* commit '836e99036ce3b3b82e55b7cb0a6adb4c596bcdde':
  Import translations. DO NOT MERGE

Change-Id: Ieef812b9fda22332de0d36735064c223a8e03db3