diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-11 01:06:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-11 01:06:57 +0000 |
| commit | 60d10ea0f4cfcb7fcd3c6b188751368c3eeed591 (patch) | |
| tree | 48b0a375c510528f5a4cf95dc5aa543e3641e379 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b1e3c8aaf42ee3d5910d1f7b93644bf1d05b2eee (diff) | |
| parent | 2c02197bdd12378c7b2f8ee4bcaa625b2c564ede (diff) | |
Merge changes I559eb049,I52425b84
* changes:
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions