summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Roshan Pius <rpius@google.com> 2023-10-20 04:07:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-20 04:07:45 +0000
commit0b561d0c15ae44d250a6669094e104daaa7ac11a (patch)
treea868559e1d0db6518afa7f7da5377f95bc746535 /libs/androidfw/AttributeResolution.cpp
parent17048ee0fd613bba969b1538e6f3dc27867e69dc (diff)
parent770be83e3a737f9609ef288a93800f4851226c10 (diff)
Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f621432634 am: 74b083e623 am: 770be83e3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2795936 Change-Id: I3888076aabfe22e773acbccea8c78680992a7fce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions