summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2016-08-19 12:16:49 -0700
committer Adam Lesinski <adamlesinski@google.com> 2016-08-19 13:29:40 -0700
commit8197cc460e02c6445434eace435e3d38ebe475c6 (patch)
tree4d3a76e6bf511d3f6ef331fc9dcd89ebf1ebd0fe /libs/hwui/ProgramCache.cpp
parentaa0255da28675431c93593a8dd2d225538cbb3ac (diff)
AAPT2: Merge Styleables instead of overriding them
Styleables merge in AAPT. Preserve this behavior. Bug:30970091 Change-Id: Ie68ca675aeecd873c0648682182e2fc574e329a0
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions