diff options
| author | ltrochtova <ltrochtova@google.com> | 2016-12-05 15:51:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-05 15:51:10 +0000 |
| commit | ad5eb744aa84271ed5fdad7fcedfa3ac3d2f9445 (patch) | |
| tree | 0cd920d3e82c2f6b7b50fd7616a2abb9b2049228 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3e149d59f950a7ce73b0d156499a156ac10c5d0f (diff) | |
| parent | 8058dc0e82dcfe13a55c9262e7751aff277506f1 (diff) | |
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours
am: 8058dc0e82 -s ours
Change-Id: I1d84e927e8cd05c51285fba9226b1bd9f2c1c12a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions