tree cedd9a95a1434dc2de8d8c715b1164b53cc18c00
parent 13087dea30bb5bcba08d2fb7cfdeec144897af57
parent 8b53e55270a07c7a3e0997a0295661ec93a8aefe
author Bill Yi <byi@google.com> 1486627375 +0000
committer android-build-merger <android-build-merger@google.com> 1486627375 +0000

Import translations. DO NOT MERGE
am: 8b53e55270  -s ours

Change-Id: Iaf7834113db448ab699aec0f28cb2664762d78a9