Andreas Gampe 8ccfe899a7 Merge "resolved conflicts for merge of b6d6c04a to master"

2015-03-11 00:19:27 +00:00

..

android

Merge "Notify TrustAgentService when device policy configuration no longer applies"

2015-03-11 00:12:56 +00:00

com

resolved conflicts for merge of b6d6c04a to master

2015-03-10 15:45:36 -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

…