summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-12-29 11:27:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-29 11:27:37 +0000
commit2518cfcc595f77014ece27f94cbcc24623da9120 (patch)
tree77326cc3ed026386492090a25aebec91c4040661 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentbf9a3b4b0dcaac45e29c721c74d88b0d85f96b0e (diff)
parentac437a2961df887aa44e87b1b4e4b3ba19e4ceed (diff)
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions