diff options
| author | 2023-05-19 13:29:47 +0000 | |
|---|---|---|
| committer | 2023-05-19 13:29:47 +0000 | |
| commit | 14a34f75674601d1e62d0cb3acb223a525787cdc (patch) | |
| tree | 160db356030dcc8b0dc22df2b09a8f5835abc518 /libs/androidfw/ApkParsing.cpp | |
| parent | cea05d44a03ea2e75cc755134ff0d2c13f63784a (diff) | |
| parent | 1dedebd281d2ea12a1cdde521c1494200a2d1b2a (diff) | |
[automerger skipped] Merge "Revert "Add 2 ANGLE deferlist settings"" am: 5594c74e45 am: 1942ca4cb9 am: 1dedebd281 -s ours
am skip reason: Merged-In I47f940612f8be0c83f0be04c2cc1af7908e37382 with SHA-1 ef6fa3f9d3 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2269789
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2596848
Change-Id: Ibbee9deb9003fb2238aa752f017aba32b40e9a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions