diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-10-12 17:12:08 +0000 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-12 17:12:08 +0000 | 
| commit | eda0ea41904e47bd5b2e998e22c9fc7e42d7dfef (patch) | |
| tree | 7bcf785cfda42742df021680bdc45f92a67f2d3e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c8b71bec124373d6f038cfdbd243c004e102626e (diff) | |
| parent | 3d3f766c8b37dcf495235ca4a500494498712eed (diff) | |
am 3d3f766c: am 871d96b4: am 13c5dd5c: am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* commit '3d3f766c8b37dcf495235ca4a500494498712eed':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
