summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Thomas Stuart <tjstuart@google.com> 2023-03-01 03:09:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-01 03:09:58 +0000
commit4f58b3b62bc8a1fd0ac42789932a75cbcbe84202 (patch)
tree32daa6abc9786d0834bf00c4c44dbf0de3122a93 /libs/androidfw/ApkParsing.cpp
parent6161fa8d6f8ab5e035ba334129da8d7368fe98eb (diff)
parent74a2faf503e9df6560fb86f766c736e301085910 (diff)
[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into sc-dev am: 854dac6da2 -s ours am: 3f0f4123e3 -s ours am: fe459b30f3 -s ours am: b8b17cb4bd -s ours am: 74a2faf503 -s ours
am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: I69c6221f2ce623d1d0cb34d74d8c848678580986 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