summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-07-27 20:49:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-27 20:49:09 +0000
commit98cbe497f58aaf8ab8bc106d79a3aed567d9b58b (patch)
tree013f85b2ef91a4deb3f2dafb40a6ba504abe8172 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentcd05663186dc232511b98691e454d2f3ef61d0e6 (diff)
parentc2c611c4e5024bc9405cae4c9ffe9d72599f9751 (diff)
am c2c611c4: am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit 'c2c611c4e5024bc9405cae4c9ffe9d72599f9751': Allow Settings to set background data restrict on secondary users.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions