tree fe1140f188bed98d60ad4e7ba9097d376b6d9627
parent 8f5e57e7c69ce71cf12e4d473e6f40804b281e23
parent 55144fc55535f22e8ea7dffe881be78fb8bd1cf2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580457091 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580457091 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 55144fc555 -s ours
am skip reason: subject contains skip directive

Change-Id: I2bf756bb5eb88628b3c79a84d70c8dd54ae9b91d