summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-02 16:52:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-02 16:52:02 +0000
commit2d74e17bb0fe0bf9b52332f2664460a8a54549ec (patch)
tree55441364295c68da7857320492cfea189cd5de81 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent14d77d69a8d63655022d681cdb0f2afbca3058c7 (diff)
parent85e4b05461d36a39d5aa806fe19482ae9f5a29bc (diff)
Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 am: 6b9371ceef" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions