tree 02c32efeb600144551df8b8eb035d1c833f8d29c
parent f41c35d774de88bc668c94ee5cfa43b60eb6eea1
parent f1b2785129b64a140764483901530f40716e53f5
author Bill Yi <byi@google.com> 1459439144 +0000
committer android-build-merger <android-build-merger@google.com> 1459439144 +0000

Import translations. DO NOT MERGE
am: f1b2785  -s ours

* commit 'f1b2785129b64a140764483901530f40716e53f5':
  Import translations. DO NOT MERGE

Change-Id: I36787400a12a3a9258a9d9c569da69b79cb2738f