summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Nate Jiang <qiangjiang@google.com> 2020-07-31 01:11:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-31 01:11:50 +0000
commitd48423561e200b60af50aaf77ec769e0618d0af9 (patch)
tree90fefaf943c8de7041b475e9a2304c8e3343c5af /libs/androidfw/AttributeResolution.cpp
parent8ca5e731c8e49f16e6d29c16ef705a65f701fef9 (diff)
parente790db3aab1ae6916ad45f0f82cc9fd9b5bf148c (diff)
Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: 5be65d0810 am: 838b971cc4 am: e790db3aab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380674 Change-Id: Ia82462a731e19ef1c0e279d665f73c3e538468fa
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions