diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-05-14 01:42:29 -0700 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2014-05-14 03:56:34 -0700 |
| commit | 7ef92576016aaa43e3488b6ddc213b7c1e52b118 (patch) | |
| tree | 0b50640cc122d362a03b7c7e49e5c75b2dda9db7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b6bb6c61dd77c1b3007f0b0bbb89ee693e63d0b6 (diff) | |
Fix compile errors after merge.
These are due to changes to ConnectivityService that were made
after master-multinetwork-dev branched off. They mostly didn't
cause merge conflicts because they were in different parts of
the file from the multinetwork changes, but they cause compile
errors now. These particular changes should be fine - they are
all in dead code anyway, and their functionality had already
been re-implemented in the new code.
Change-Id: I0ac9e39c3c975c8e8dc04ad11b6b85366693865c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions