tree d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
parent 7894192e9741c7d161c85276ff452bc3558a5181
parent 65b333a2cfcce35e7a4e2e7c064f7beb78e278aa
author Bill Yi <byi@google.com> 1555119429 -0700
committer android-build-merger <android-build-merger@google.com> 1555119429 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8069da859c -s ours am: 58685f02a2 -s ours
am: 65b333a2cf -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1799f5d39471d61487c20e069307299afa07624