tree b59cb84871bc4f5318a68062c4658968f50ae37d
parent d1d321e16c3b23c8f9b58c85c45144b8e4430dc5
parent c4f4ee429f47320c2589544708df574f71146b11
author Bill Yi <byi@google.com> 1499746529 +0000
committer android-build-merger <android-build-merger@google.com> 1499746529 +0000

Import translations. DO NOT MERGE am: 74ac9a4812  -s ours
am: c4f4ee429f  -s ours

Change-Id: Id178390fc3a9012562ea24d9f2ddde49393b8f4f