Paul Jensen 8f58207319 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev ...

automerge: d9d48cc

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

2014-12-11 05:49:18 +00:00

..

java

am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev

2014-12-11 05:49:18 +00:00

jni

resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 10:42:08 -08:00

res

am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev

2014-12-11 03:41:48 +00:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00