tree e323036d038ae166b3ee0e66eb0bae354bb4f878
parent 847725e7383dce7a976e7f792e3b250dfc83a920
parent fa52c2bd8adfc35edd799ee0680565ef98f26b43
author Bill Yi <byi@google.com> 1493546574 +0000
committer android-build-merger <android-build-merger@google.com> 1493546574 +0000

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

Change-Id: Id93c9c0450c92590a11a1f7e7989cb0d4514f1cd