summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-29 18:58:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-29 18:58:13 +0000
commit9439fbd68514a90e7c3e303de9b719be217eeb04 (patch)
treec5ca563634b714d301b5d882c612af175875c5e0 /libs/androidfw/AssetManager2.cpp
parentbe9add698462996b383ec3a1ad03d387d1731fdc (diff)
parent7e19bd3cd06995370215ac980170b37b1b1afe22 (diff)
[automerger skipped] Merge "Fix the SetConnectivityStatus callback" into tm-qpr-dev am: d1f2c290e6 am: 7e19bd3cd0 -s ours
am skip reason: Merged-In I6560e016ee1663779b3c59d45520ef98507cad77 with SHA-1 621f87e3b5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19719516 Change-Id: If63d195505baf38f842695936cdf9aad8d62dce3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions