diff options
| author | 2023-01-30 08:15:40 +0000 | |
|---|---|---|
| committer | 2023-01-30 08:15:40 +0000 | |
| commit | 874cfbd7664a3c9e27c535fe5e24f1d5c7d2be29 (patch) | |
| tree | e79cbb42d4090c8b7950422d194a4d5db0e29f7f /libs/androidfw/ApkParsing.cpp | |
| parent | 97311e863a0bf6cf376ee5c8dbe52f24562055b0 (diff) | |
| parent | 4c0556cca1bd395f5165a834dfc18ac1a2d7c793 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason" into tm-qpr-dev am: d595241fc4 am: 4c0556cca1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20895033
Change-Id: Icb594b6350c0822512a8bb0d5ef7f432293eec93
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