summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2015-06-30 23:43:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-30 23:43:31 +0000
commit1df60ca5f17fa44b7894f7dbee3c395abae4a8c8 (patch)
tree3e708cb512fbf4dc29a7650fcc72c5cf39bf08ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentcf5db1fa763979498a7c95d8c0eaad424f0fed2c (diff)
parent67abd3b356794b316e647a9ad20a24b09406823f (diff)
am 67abd3b3: am da3d7b2b: am 2b64ec47: Merge "Don\'t allow non-admins to adopt sd card for internal storage" into mnc-dev
* commit '67abd3b356794b316e647a9ad20a24b09406823f': Don't allow non-admins to adopt sd card for internal storage
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions