diff options
| author | Anton Hansson <hansson@google.com> | 2021-02-23 18:19:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 18:19:50 +0000 |
| commit | 9e5c8ff5bd6724a8a4623b9c21d4dd03087d2b40 (patch) | |
| tree | ad97a742ef6f6492294e6e60b1f9dcb85326eb32 /os/java/com/android/modules/utils/ParceledListSlice.aidl | |
| parent | ea30dc459e872dcd5cb8529f0c8afd152fbcbdb6 (diff) | |
| parent | ec275c877d294afaca6c06d9d5cd43f479d60f9a (diff) | |
| download | modules-utils-9e5c8ff5bd6724a8a4623b9c21d4dd03087d2b40.tar.gz | |
Disallow use of error-prone merge-strategies am: ec275c877d
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/1602015
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I655d6208a2665c9ddb18c5a25d4036440e81d925
Diffstat (limited to 'os/java/com/android/modules/utils/ParceledListSlice.aidl')
0 files changed, 0 insertions, 0 deletions