summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-04-25 09:46:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-25 09:46:43 +0000
commit515e9b3b6359dac68491159ec9826a96a7d3aa43 (patch)
treecf1f88e949de6f1a7f65c4bee4d1b17aec24900d /libs/androidfw/AttributeResolution.cpp
parent23e88129dfd7ebe11199b8074bbe63031285dc79 (diff)
parentb435101ec8aa827375e837c4843f6444145e1f4c (diff)
Merge "DO NOT MERGE: Do not allow overlaying of attributes with conflicting formats" into qt-dev
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions