summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2016-08-24 16:03:48 -0700
committerAdam Lesinski <adamlesinski@google.com>2016-08-26 19:40:50 -0700
commit5c3464c75fc517c0306a4ffd39c59671ccfde544 (patch)
tree6a20580de33238d2c16a761f880a442eb5c74c0b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parente637f31581787efc533b2115ca7d71fa8d92e98b (diff)
AAPT2: Fix merging of styleables the right way
Styleables should only be merged when processing overlays. This moves the styleable merging code out of ResourceTable and into TableMerger. Change-Id: I3aae05cf4dd875cd25ac2ac744b61194409b2fee
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions