tree d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
parent 13aa8a5c41ab3453c89c9948a9b7e8b1303f12be
parent 1e287c445996ed21c64ec942c30931f6321ff288
author Bill Yi <byi@google.com> 1555110791 -0700
committer android-build-merger <android-build-merger@google.com> 1555110791 -0700

[automerger skipped] Import translations. DO NOT MERGE am: a9174a7fd7 -s ours
am: 1e287c4459 -s ours
am skip reason: subject contains skip directive

Change-Id: I2617373cf49a5033ff02c4287fbe765fe63be516