summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-10 02:38:29 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-10 02:38:29 +0000
commit565b47381576dd24776bcc2c0f79210363970eb6 (patch)
treefb076d4d0baec0089055210410d24ec86bbce344 /libs/androidfw/AttributeResolution.cpp
parentdcdb9e34ca1b12e028b5d9edb07c30921f855296 (diff)
parentf91aab247b9779c38bcc5480884227c9a988882f (diff)
Merge changes from topic "am-7baab411512f43e0802fbba5fbb3484d" into udc-dev
* changes: [automerger skipped] Merge "Skip letterboxing if the activity below is embedded" into tm-qpr-dev am: 53b8173a0d -s ours [automerger skipped] Skip letterboxing if the activity below is embedded am: ad7d89c22b -s ours
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions