Paul Jensen bf10991d76 resolved conflicts for merge of 30813942 to mnc-dr-dev ...

Change-Id: I8b33797528f16596f0d350ad38458baa51fcacf6

2015-07-29 11:31:53 -04:00

..

android

resolved conflicts for merge of 30813942 to mnc-dr-dev

2015-07-29 11:31:53 -04: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

Start handshake before calling hostname verifier, part 2

2015-05-13 13:04:44 -07:00

jarjar-rules.txt

…

overview.html

…