Alex Klyubin 305ebe207a resolved conflicts for merge of 261e7a37 to master ...

Change-Id: If0a3389764965fe27bf567090a6e24069b61c544

2015-04-01 18:23:27 -07:00

..

android

resolved conflicts for merge of 261e7a37 to master

2015-04-01 18:23:27 -07:00

com

Fixing issue related to printing out of display state and idle mode in the batterystats checkin.

2015-04-01 16:07:48 -07:00

org/apache/http

Move apache specific portions of android.net.http to external/apache-http.

2015-02-12 11:15:49 +00:00

jarjar-rules.txt

…

overview.html

…