diff options
| author | 2023-03-06 17:22:08 +0000 | |
|---|---|---|
| committer | 2023-03-06 17:22:08 +0000 | |
| commit | c4d91fb7c6d074a5c87443bb9d1d5eef625808d2 (patch) | |
| tree | 44d2747c2678ced7236c00720e2b436fb80b5daa /libs/androidfw/ApkParsing.cpp | |
| parent | c17ad0c7f2b02bd04661a97b31801483340c527d (diff) | |
| parent | e913f676891c2b8991dc8242329a5be3dc4e784a (diff) | |
[automerger skipped] Merge changes from topic "revert-21485850-AFHEQKBZWB" into tm-qpr-dev am: a7757c3bc2 am: e913f67689 -s ours
am skip reason: Merged-In Id4a6dd22708ddee38dd6c10ceb6c81f6a7bfb44f with SHA-1 9c630e3602 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21484345
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21732135
Change-Id: Ibe75132e830e1b0d19e5e4f5fbca72813bfbe5e1
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