diff options
| author | ltrochtova <ltrochtova@google.com> | 2016-12-01 22:07:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-01 22:07:36 +0000 |
| commit | 46eb3f6cdb475a4a6c10ce272b87a9ec9c64de69 (patch) | |
| tree | 8ec8465ccd715083f250e2e391fd7e3d5516a05c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c853f3a5ff40d8ff5718d276cc0e5fab74c9acc0 (diff) | |
| parent | 96fe993907e8ba21ebbb4728222f43e83bd3f7b0 (diff) | |
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f -s ours am: 834725f579
am: 96fe993907
Change-Id: I6f3b70920942f03549c60f55437855e1f7c31f22
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions