diff options
| author | ltrochtova <ltrochtova@google.com> | 2016-12-01 21:57:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-01 21:57:04 +0000 |
| commit | 96fe993907e8ba21ebbb4728222f43e83bd3f7b0 (patch) | |
| tree | 5c406d13b3178dcf43aaafe1f899418325c09ea1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2f5f210f7dd992ae4b8d6af8d27c89de9e3521cc (diff) | |
| parent | 834725f57912dfb83e14d6baac29349e40c25e94 (diff) | |
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f -s ours
am: 834725f579
Change-Id: Idda7a70676bb3d6ac028482064c22e61180768f6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions