diff options
| author | ltrochtova <ltrochtova@google.com> | 2016-12-01 21:53:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-01 21:53:41 +0000 |
| commit | ecb5e3a6659997539b54b6630a40368ad1345d8f (patch) | |
| tree | b44c741b6ef180e6b77e3bedfff945244745a062 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 287fa3404cc34143c7eb995786d934fbbe6bb71b (diff) | |
| parent | 6a3e0921fe4fbe7026d171af330dbf545b286fc9 (diff) | |
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92 -s ours am: 0a21ba22e3
am: 6a3e0921fe
Change-Id: I6bfce1299a429a8cf3a42b2d265550a588f7f5d9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions