tree 38eddd8f55b61802ede12c5681f80316f5b0f7f5
parent bd68f60fc729b0a8065f883b613fec475f6fe5aa
parent 69d52910708e582b185b51eb0ef001772e656543
author Bill Yi <byi@google.com> 1499440956 +0000
committer android-build-merger <android-build-merger@google.com> 1499440956 +0000

Import translations. DO NOT MERGE
am: 69d5291070  -s ours

Change-Id: Ib1da5d25890b11e7da93bbad8aa73ecc27383ca6