summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2016-03-04 00:09:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-04 00:09:27 +0000
commitf63ed0f1ca490aa783ab1873b3c6be764709843f (patch)
tree259f1ccc6c51374db17d39223394ecddbeacfde7 /tools/aapt2/diff/Diff.cpp
parent11c2eaab97e07953f9f7301c3200c79225d70975 (diff)
parentf033a6ca9f1ebe810b511861267665948bcd019e (diff)
Merge changes I3651e5ae,I37058468
am: f033a6ca9f * commit 'f033a6ca9f1ebe810b511861267665948bcd019e': [RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16 [RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions