| commit | 43f8af4e495e5fc6d5853094f37280cf3575bb05 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Feb 23 19:10:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 19:10:44 2021 +0000 |
| tree | b470a8f005d9559aa934b2cea0143a3ccc45e80e | |
| parent | abde91d5561c308f80e542d802a213c1d08c05ef [diff] | |
| parent | 6631354fb3825dd0355ef103dcd1a8ecbffd49d1 [diff] |
Disallow use of error-prone merge-strategies am: 6631354fb3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1602054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie50b66c4ab106e2d66d5598357edc78e32705749