summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2020-07-06 21:47:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-06 21:47:05 +0000
commit755dc09dc0a6a6f226ac172ef7131b244a81b078 (patch)
tree6f7da6d43dd5e623de92eabc809e41a0c22a0609 /libs/androidfw/AttributeResolution.cpp
parent837f6a99e9e31abc9d0ef73b7dfbb989eecba23e (diff)
parenta35ab2884ad76faa9485ccd60bf4b07b4adb9233 (diff)
Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b96 am: a35ab2884a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055451 Change-Id: I40161076e4d26ef91dde8ddf308ca61094150de9
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions