summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Wei Sheng Shih <wilsonshih@google.com> 2024-04-15 04:25:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-15 04:25:57 +0000
commita1571973761564e5b0f334ae396b2c9fca23ab7b (patch)
treed18f1baf7ff179a18d0814c5eabdbec6dfa011bc /libs/androidfw/AttributeResolution.cpp
parent2144c1ba2ab69fa8c03d4eb3ea4d97b12370bfd9 (diff)
parent5cf7320199729603083eb436c6a7cf9cc4b26bfa (diff)
[automerger skipped] Merge "Revert "Correct activity's lifecycle when the process was killed in background."" into 24D1-dev am: 5cf7320199 -s ours
am skip reason: Merged-In I80756609fe643877971408934b19ad97aa0ae746 with SHA-1 bec26a0728 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26928336 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26955219 Change-Id: I64d79126e313018130f20b91d703cb811bfcda91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions