summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2023-06-16 20:36:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-16 20:36:52 +0000
commit64301a2cfb0c5f80409ac299c79dd5e52644a794 (patch)
tree88e2739068d6432bd87e54862b1b6108a464b239 /libs/androidfw/ConfigDescription.cpp
parenta4b275a01ab7b5fb072dffce2335be425283bcd4 (diff)
parent3f204c4a8b3231a1ab3e28c6a31a721ac7026048 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-qpr1-dev am: db5281558a -s ours am: 3f204c4a8b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23520003 Change-Id: Ie84a0626392df1f4413e5d508f7826a6987e5c33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions