Jason Monk 103a02453b am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev ...

* commit 'f9464838fe141aac1c677e2f4ec0133381fbb5af':
  Guarantee that PAC Local Proxy owns Port

2013-09-13 17:22:53 -07:00

..

java

am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev

2013-09-13 17:22:53 -07:00

jni

am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev

2013-09-11 17:25:05 -07:00

res

am 0899d983: am 49580cf1: Merge "SystemUI status bar/quick settings updates." into klp-dev

2013-09-13 13:27:13 -07:00

tests

am 6c2ad7ac: am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev

2013-09-11 17:31:04 -07:00