frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Move apache specific portions of android.net.http to external/apache-h...	Narayan Kamath	2015-02-13	20	-5630/+5
\|\
\| *	Move apache specific portions of android.net.http to external/apache-http.	Narayan Kamath	2015-02-12	20	-5630/+5
* \|	am f69f3737: am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for...	Jeremy Joslin	2015-02-12	1	-0/+4
\|\ \
\| * \	am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR...	Jeremy Joslin	2015-02-12	1	-0/+4
\| \|\ \
\| \| * \|	Update Javadoc for EXTRA_NETWORK.	Jeremy Joslin	2015-02-11	1	-0/+4
* \| \| \|	Merge "Do not throw NullPointerException from PacService"	Andrei Kapishnikov	2015-02-11	1	-3/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Do not throw NullPointerException from PacService	Andrei Kapishnikov	2015-01-16	1	-3/+2
* \| \| \|	Remove apache specific socket factory API.	Narayan Kamath	2015-02-04	1	-0/+2
* \| \| \|	Remove path, query, and fragment from http Uri.	Craig Mautner	2015-02-03	1	-1/+8
* \| \| \|	Merge "Also include the domain when parceling StaticIpConfiguration." automer...	Lorenzo Colitti	2015-01-30	1	-0/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge "Also include the domain when parceling StaticIpConfiguration." automer...	Lorenzo Colitti	2015-01-30	1	-0/+2
\| \|\ \ \
\| \| * \| \|	Also include the domain when parceling StaticIpConfiguration.	Lorenzo Colitti	2015-01-29	1	-0/+2
\| \| * \| \|	Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()	Paul Jensen	2015-01-29	2	-2/+3
\| \| * \| \|	Support connecting to networks with misconfigured subnet masks.	Lorenzo Colitti	2015-01-28	1	-4/+11
* \| \| \| \|	am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfi...	Lorenzo Colitti	2015-01-23	1	-4/+11
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfi...	Lorenzo Colitti	2015-01-23	1	-4/+11
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge "Support connecting to networks with misconfigured subnet masks." into ...	Lorenzo Colitti	2015-01-23	1	-4/+11
\| \| \|\ \ \
\| \| \| * \| \|	Support connecting to networks with misconfigured subnet masks.	Lorenzo Colitti	2015-01-23	1	-4/+11
* \| \| \| \| \|	am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in V...	Lorenzo Colitti	2015-01-23	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in V...	Lorenzo Colitti	2015-01-23	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." int...	Lorenzo Colitti	2015-01-23	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Use the proper IpPrefix and LinkAddress constructors in VPN code.	Lorenzo Colitti	2015-01-23	1	-1/+1
* \| \| \| \| \|	am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev a...	Robert Greenwalt	2015-01-22	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev	Robert Greenwalt	2015-01-21	1	-0/+5
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Rerun entitlementcheck on sim change.	Robert Greenwalt	2015-01-14	1	-0/+5
\| \| \|/ / /
* \| \| \| \|	am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."	Neil Fuller	2015-01-20	1	-9/+10
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."	Neil Fuller	2015-01-20	1	-9/+10
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Fix for broken docs build.	Neil Fuller	2015-01-20	1	-9/+10
* \| \| \| \|	am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp	Neil Fuller	2015-01-20	2	-50/+60
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp	Neil Fuller	2015-01-20	2	-50/+60
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Changes associated with an OkHttp upgrade	Neil Fuller	2015-01-20	2	-50/+60
* \| \| \| \|	am 932bfab9: am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when e...	Paul Jensen	2015-01-06	1	-15/+18
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| / \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or re...	Paul Jensen	2015-01-06	1	-15/+18
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Clear process DNS NetID binding when expiring or releaseing legacy requests.	Paul Jensen	2015-01-06	1	-15/+18
* \| \| \|	am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev automer...	Robert Greenwalt	2014-12-11	1	-0/+8
\|\ \ \ \ \| \|/ / /
\| * \| \|	am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev	Robert Greenwalt	2014-12-11	1	-0/+8
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Add toString in NetworkFactory." into lmp-mr1-dev	Robert Greenwalt	2014-12-11	1	-0/+8
\| \| \|\ \
\| \| \| * \|	Add toString in NetworkFactory.	Robert Greenwalt	2014-12-10	1	-0/+8
* \| \| \| \|	am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...	Paul Jensen	2014-12-11	4	-14/+75
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...	Paul Jensen	2014-12-11	4	-14/+75
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev	Paul Jensen	2014-12-11	4	-14/+75
\| \| \|\ \ \
\| \| \| * \| \|	Fix several HTTP proxy issues with multinetworking.	Paul Jensen	2014-12-10	4	-14/+75
* \| \| \| \| \|	am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supp...	Erik Kline	2014-12-10	1	-13/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functi...	Erik Kline	2014-12-10	1	-13/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lm...	Erik Kline	2014-12-10	1	-13/+1
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.	Erik Kline	2014-12-08	1	-13/+1
\| \| * \| \| \| \|	am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs	Elliott Hughes	2014-12-09	1	-7/+3
\| \| \|\ \ \ \ \
\| \| \| * \ \ \ \	am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs	Elliott Hughes	2014-12-09	1	-7/+3
\| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \|	Fix typo.	Elliott Hughes	2014-12-09	1	-7/+3
* \| \| \| \| \| \| \| \|	am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/...	Wink Saville	2014-12-09	1	-1/+8
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /