Amith Yamasani 0c25fbde82 resolved conflicts for merge of 5f1c2dbc to master ...

Change-Id: I4d08ad224c8cddd1d379c0f9ec326165a08dd651

2015-06-19 17:04:02 -07:00

..

android

resolved conflicts for merge of 5f1c2dbc to master

2015-06-19 17:04:02 -07:00

com

am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev

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

…