diff options
author | Todd Kennedy <toddke@google.com> | 2017-06-05 17:40:21 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-05 17:40:21 +0000 |
commit | 18ccf4446c03f7b44bbbde0abf7746b703a68879 (patch) | |
tree | 010a78d8027b61e986efea8cde7fc298e34b554a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7d7bb77952383449ac6d6b79f38f2b7402b022d0 (diff) | |
parent | 266e587f6b5d6bb6933a47e53bede9b2c7265bc3 (diff) |
Merge "Protect instant apps from full apps" into oc-dev am: 4972aa30bf -s ours
am: 266e587f6b -s ours
Change-Id: I302f180dc9813b015da800785feb493e8b9a0a7f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions