summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2022-12-03 00:18:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-03 00:18:37 +0000
commit4a4241916b604d3ed0bad19303def8190112a0ba (patch)
tree13fd22cb1f1dafab9e411818d22c188f00662fba /libs/androidfw/ConfigDescription.cpp
parenta9ad071c40d43c16d9e629f9c3aa833d8d70afaf (diff)
parentada079bc573872a2cd50179496a86b1fe32aa997 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Use chain start token in performOpTransaction" into sc-dev am: 2791da2e05 am: 59e5e06858 -s ours am: 7bd2412841 -s ours am: ada079bc57 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20521154 Change-Id: Ibb7b9e832b1eb920223ce911655f2ac44b77f988 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