tree a5092ff150a517bd1d2e6f3b7481590e6e04a782
parent 495cc756092d176e630a69fb62c72820cb48fa7a
parent 4ce2f689606ffa89c3134b8136b9c612101930ce
author Bill Yi <byi@google.com> 1461590002 +0000
committer android-build-merger <android-build-merger@google.com> 1461590002 +0000

Import translations. DO NOT MERGE am: 4c22470  -s ours am: 4a4f2fb  -s ours
am: 4ce2f68  -s ours

* commit '4ce2f689606ffa89c3134b8136b9c612101930ce':

Change-Id: Id3bae420929c15eeae1d1e0372aa05d1ab6e294f