| commit | c7e7244ae90a451575ee5fbd9bee90d7e136f0b0 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Feb 23 21:00:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 21:00:42 2021 +0000 |
| tree | c18fde4d72ed63b8cb1515afea62373040bcc40f | |
| parent | 56bfd78b128d278b4f2ef6affd30405211441843 [diff] | |
| parent | 4891825878f7cd818fe067aae836891888d473f8 [diff] |
Disallow use of error-prone merge-strategies am: 86c4c55d81 am: 8f34219d39 am: 4891825878 Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1602053 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia74a031f21cba54a15d6d7961b7b9e8ba11e1f03