summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-09-06 23:11:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-06 23:11:18 +0000
commita68fda1ac83820e5bbc9145c79dcb0c8aaf598fd (patch)
tree6a42a15a17e7f8b34b744a8a4d46d25b920bad78 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentaee547867d421629acece2976859669b9dd2fdf7 (diff)
parent29b3e92296d7cdec0368890aa44cbe8ffb00e9bf (diff)
Merge "Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a am: b24828bd77" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions