Mathieu Chartier 8fb8207412 resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp ...

Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43

2015-06-24 15:59:18 -07:00

..

android

resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp

2015-06-24 15:59:18 -07:00

com

am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev

2015-06-24 19:48:19 +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

…