| commit | 6a04511dde93aa3923c3f61230cc127ee3878045 | [log] [tgz] |
|---|---|---|
| author | Sumedh Sen <sumedhsen@google.com> | Fri Dec 01 19:27:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 01 19:27:25 2023 +0000 |
| tree | 7b83d1aa27061ac090dd81871262dc0f42a0ee05 | |
| parent | be8e5ca207a63556bcdba65cb8d8d1b8a4d0e6d7 [diff] | |
| parent | dcf178c5d648933e2ef108865abee58a369f3e14 [diff] |
[automerger skipped] Merge "Re-land "Show failure dialog when app can't be installed due to secureFRP"" into main am: 9f331baa49 am: 844dfe3747 am: dcf178c5d6 -s ours am skip reason: Merged-In I5a2c8349b6755e3f31b05d327dc68f4461a42963 with SHA-1 dc14560740 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2848474 Change-Id: I348bcfc0e73e681b7a0edd165ccb0318030ec195 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>