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