Paul Jensen 8c83be093d am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev ...

* commit 'bf10991d76ce6674726a668939be300cae150130':
  Disable WiFi autojoin when user decides via "Stay connected?" dialog

2015-07-29 16:13:05 +00:00

..

android

am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev

2015-07-29 16:13:05 +00:00

com

Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev

2015-07-29 00:34:38 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…