summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Andrei-Valentin Onea <andreionea@google.com> 2021-03-01 08:12:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-01 08:12:06 +0000
commitb8037bb49a509ab57907dfc217373f353b84e3cf (patch)
tree13a54a019e849bd0697bf7a927026df651a9aa0c /libs/androidfw/AttributeResolution.cpp
parentcde7c9f16f12102ed8d22b0fd247ccc9dae778b5 (diff)
parent75c6b35d4bcca8010b267418df62a0eebfdd2bc8 (diff)
Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59ff am: 0f53ddc205 am: 75c6b35d4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I31110ae5c28a48ea91c4ef8e56678edfb3c7b250
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions