tree b1c5f725dfaa6fb5afd66d0b35779e019317b8e4
parent ed60e415943e887f0f269e6adea36b628baf1b5c
parent 3403a93d2c916235d7c20cb3d1951c984be0fe49
author Bill Yi <byi@google.com> 1494655237 +0000
committer android-build-merger <android-build-merger@google.com> 1494655237 +0000

Import translations. DO NOT MERGE am: ed22521f97  -s ours
am: 3403a93d2c  -s ours

Change-Id: I623a50a18ee875d4f81d27026d0d3a91480d5c88