Paul Jensen 025b336325 am 269d28ea: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc ...

automerge: 51d8af7

* commit '51d8af74a542a78682d37e4cd1e3541d45a858f0':
  Fix several HTTP proxy issues with multinetworking.

2014-12-11 10:25:47 +00:00

..

java/android/net

am 269d28ea: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc

2014-12-11 10:25:47 +00:00

jni

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

tests/coretests

Lightweight checkin output for network stats.

2014-11-21 10:11:10 -08:00