diff options
| author | 2023-01-30 08:15:10 +0000 | |
|---|---|---|
| committer | 2023-01-30 08:15:10 +0000 | |
| commit | 97311e863a0bf6cf376ee5c8dbe52f24562055b0 (patch) | |
| tree | e79cbb42d4090c8b7950422d194a4d5db0e29f7f /libs/androidfw/ApkParsing.cpp | |
| parent | f6fd68a5b4d794c155830ec10d80c85b027b0757 (diff) | |
| parent | d9b9126bb55015523ea29e83ac3fc2dee2df4e92 (diff) | |
[automerger skipped] DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason am: 63e26b3c75 am: d9b9126bb5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20895033
Change-Id: I0bc4d8fa00d1bba42dd2ace87a52e81b472387b8
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