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

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

2014-12-11 04:55:52 +00:00

..

java

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

2014-12-11 04:55:52 +00:00

jni

Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev

2014-12-10 01:33:09 +00:00

res

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

2014-12-11 03:18:42 +00:00

tests

Sanitize display names, keep extensions intact.

2014-12-01 09:38:49 -08:00