commit | 5084743b60bb6e183dd12c96fffd7cde911647a6 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 23 04:38:41 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 23 04:38:41 2021 +0000 |
tree | 600440b54f08b54a46ed27475f883488c5c42c03 | |
parent | d856b73e829af2bfda86c775fceae2ef0e116dc7 [diff] | |
parent | da07ab9c40f42d381d5ae164438357033809a856 [diff] |
Merge changes from topic "am-78efe437ad0b41f892ed86ce7e90fb70" into sc-qpr1-dev-plus-aosp * changes: Merge changes from topic "presubmit-am-8eede051c5d84583868b44f7dd92ffd1" into sc-dev-plus-aosp am: e9c506530c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1a84904d54 am: 20b043671a -s ours