summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2015-06-30 23:26:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-30 23:26:30 +0000
commit67abd3b356794b316e647a9ad20a24b09406823f (patch)
treede87e79381e4d5bc044713c888f2f4039c127564 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent1ee7dc939fc01d118b104d439384b96d312cca16 (diff)
parentda3d7b2bd7311bbec91b60199c85ceb22750139e (diff)
am da3d7b2b: am 2b64ec47: Merge "Don\'t allow non-admins to adopt sd card for internal storage" into mnc-dev
* commit 'da3d7b2bd7311bbec91b60199c85ceb22750139e': 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