diff options
| author | Bart Sears <bsears@google.com> | 2012-01-04 13:49:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-04 13:49:34 -0800 |
| commit | 875b69928193e464243cf491bfe861f30644e9b4 (patch) | |
| tree | 0af9bfa846c0e74c2520085a24e9a64e81c023b9 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1a4b99396d7d4c7cf0b9a3acc56807532064be90 (diff) | |
| parent | 705665acda5fec6c8c76683b2e5850b0bd447449 (diff) | |
am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
Do not allow file:// access when it is disabled. Do not merge.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions