| commit | c89d81e29b9830bf7cd2e458be0eb544ecf6ffc8 | [log] [tgz] |
|---|---|---|
| author | Liana Kazanova <lkazanova@google.com> | Wed Sep 07 23:49:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 07 23:49:35 2022 +0000 |
| tree | 8850e6b4b5506ee391aa125bbbe31eddba5ee997 | |
| parent | bce4bc72a5d5e0bd16938a19f2f304dfc9efa378 [diff] | |
| parent | 7a601f8e70a453f4f0dd3b96bdd347f369cf1634 [diff] |
[automerger skipped] Merge "[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360" into sc-dev am: b62eeefe44 am: 7a601f8e70 -s ours am skip reason: Merged-In I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96 with SHA-1 8c2c7b4164 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087 Change-Id: Iabb8478ce7dd206e67385f5cc927cf8900330576 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>