summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-07-17 18:30:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-17 18:30:31 +0000
commit6b2d1be6628fa80a4e2c9f8c893606dc1030cf7f (patch)
tree797037d6388c357c84eba7f496f6f9890be1d414 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent62237c4ea09ab52db7176c838ca713ae3d87e933 (diff)
parentf4d5fa93bb9287a3748304436b4e57e8e8132713 (diff)
am f4d5fa93: am 55596f85: am 098a88e6: am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit 'f4d5fa93bb9287a3748304436b4e57e8e8132713': Revert "Temporary lower GET_ACCOUNTS protection level"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions