summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Jack Yu <jackyu@google.com> 2023-03-14 01:55:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-14 01:55:32 +0000
commit3473c96da73db90065f242b9f1b9561cd75e1c8d (patch)
tree961aa2634212f944c8f9575103b91a3de280d821 /libs/androidfw/ApkParsing.cpp
parent542bfba9416e50f16322430a45c91bd0b1c01189 (diff)
parentbca81f5c0fa6dfdfda45f063bcfc5a125e5574a2 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"" am: 5f43355071 am: e4157c3a4d am: bca81f5c0f -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2484178 Change-Id: I7846e50418c219f77600d3a3921caeb5e9842bee 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