tree 57b59b5d0fb233cc626f7f09a3dc2dbb7d87b05c
parent 667916cf5a4736387a84b6f1c3224784ed9bbd9e
parent 431ffdc8d6ce826385ccd984c66d1f54c527bf75
author Bill Yi <byi@google.com> 1464995294 +0000
committer android-build-merger <android-build-merger@google.com> 1464995294 +0000

Import translations. DO NOT MERGE
am: 431ffdc8d6  -s ours

* commit '431ffdc8d6ce826385ccd984c66d1f54c527bf75':
  Import translations. DO NOT MERGE

Change-Id: I88453b42dd42b08ddf12d00d7edb587e614b8f0d