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-01 23:04:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-01 23:04:09 +0000
commit5735a69ac3468df2626328837188517b25b7bdee (patch)
treec502c787856f286ea9d4801af9e43fc9e05b482c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentf6aa0d6612a445b1a08d46cc5a1aa61ab14da288 (diff)
parent8315cf49ecd5b1fcff6b2504d2ed0512af597144 (diff)
Merge "cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae am: 8b1df8f382" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions