Jason Monk 76d50fc5d6 am e6ecfca2: am 45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev ...

* commit 'e6ecfca245c8a5859f4566e42732d41579cff118':
  Fix SOCKS proxies from being dropped from PAC

2014-08-21 03:07:45 +00:00

..

java

am e6ecfca2: am 45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev

2014-08-21 03:07:45 +00:00

jni

am 08ae94e2: am d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev

2014-08-21 03:03:17 +00:00

res

am 4f39448e: am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev

2014-08-21 02:57:30 +00:00

tests

follow up minor fixes for connectivity manager test

2014-08-20 17:40:18 -07:00