Paul Jensen 62911488e9 am 7a0d9799: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc ...

automerge: d6524c4

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

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

..

java/android/net

am 7a0d9799: 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