frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am de1bc6cb: am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on ...	Wenchao Tong	2014-08-21	1	-5/+0
\|\
\| *	am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiMana...	Wenchao Tong	2014-08-21	1	-5/+0
\| \|\
\| \| *	Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev	Wenchao Tong	2014-08-21	1	-5/+0
\| \| \|\
\| \| \| *	Revert "Annotate @SystemApi on some WifiManager methods."	Wenchao Tong	2014-08-20	1	-5/+0
* \| \| \|	am fad9e3a0: am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev	vandwalle	2014-08-21	1	-6/+23
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev	vandwalle	2014-08-21	1	-6/+23
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "per bssid blacklist" into lmp-dev	vandwalle	2014-08-21	1	-6/+23
\| \| \|\ \
\| \| \| * \|	per bssid blacklist	vandwalle	2014-08-20	1	-6/+23
* \| \| \| \|	am 00fde029: am 5e3130d6: am fa141926: Merge "Improve documentation of ScanRe...	Jeff Davidson	2014-08-21	2	-3/+10
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and Wifi...	Jeff Davidson	2014-08-21	2	-3/+10
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev	Jeff Davidson	2014-08-20	2	-3/+10
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	Improve documentation of ScanResult and WifiInfo.	Jeff Davidson	2014-08-12	2	-3/+10
\| * \| \| \|	am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE...	vandwalle	2014-08-20	1	-10/+0
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev	vandwalle	2014-08-20	1	-10/+0
\| \| \|\ \ \
\| \| \| * \| \|	remove passpoint, except ANQP - DO NOT MERGE	vandwalle	2014-08-19	1	-10/+0
\| \| \| \|/ /
* \| \| \| \|	am 143817b4: am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some Wif...	Wenchao Tong	2014-08-20	1	-0/+5
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager meth...	Wenchao Tong	2014-08-20	1	-0/+5
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev	Wenchao Tong	2014-08-19	1	-0/+5
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Annotate @SystemApi on some WifiManager methods.	Wenchao Tong	2014-08-19	1	-0/+5
* \| \| \| \|	am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for s...	Lorenzo Colitti	2014-08-19	1	-6/+16
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configu...	Lorenzo Colitti	2014-08-19	1	-6/+16
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Stop using LinkProperties for static configuration.	Lorenzo Colitti	2014-08-19	1	-6/+16
\| \| \|/ /
* \| \| \|	am 61520b2e: am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type ...	Elliott Hughes	2014-08-18	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"	Elliott Hughes	2014-08-18	1	-0/+1
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"	Elliott Hughes	2014-08-18	1	-0/+1
\| \| \|\ \
\| \| \| * \|	WifiP2pWfdInfo set device type bugfix	Grigoriy Kraynov	2014-08-18	1	-0/+1
\| \| \| * \|	DO NOT MERGE refactor wifi p2p's startDhcpServer function	Jianzheng Zhou	2014-06-23	1	-5/+23
\| \| \|/ /
\| \| * \|	am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" in...	Wei Wang	2014-03-21	1	-1/+5
\| \| \|\ \
\| \| \| * \	Merge "Fix stopBatchedScan not working for wifi" into klp-dev	Wei Wang	2014-03-21	1	-1/+5
\| \| \| \|\ \
\| \| \| \| * \|	Fix stopBatchedScan not working for wifi	Wei Wang	2014-03-20	1	-1/+5
\| \| * \| \| \|	am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to sat...	Vinit Deshapnde	2014-03-20	1	-1/+4
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns	Vinit Deshapnde	2014-03-19	1	-1/+4
\| \| \| \|/ /
\| \| * \| \|	am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info...	Robert Greenwalt	2014-03-10	1	-17/+35
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	DO NOT MERGE Debounce wifi country code Info	Robert Greenwalt	2014-03-07	1	-17/+35
* \| \| \| \|	am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert ...	Zoltan Szatmary-Ban	2014-08-15	1	-1/+28
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in ...	Zoltan Szatmary-Ban	2014-08-15	1	-1/+28
* \| \| \| \|	am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert ...	Zoltan Szatmary-Ban	2014-08-15	1	-28/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings...	Zoltan Szatmary-Ban	2014-08-15	1	-28/+1
* \| \| \| \|	am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update ...	Narayan Kamath	2014-08-15	1	-1/+28
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Revert "Revert "Update Trusted Credentials screen in settings"""	Narayan Kamath	2014-08-15	1	-1/+28
* \| \| \| \|	am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credent...	Zoltan Szatmary-Ban	2014-08-15	1	-28/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Revert "Update Trusted Credentials screen in settings""	Zoltan Szatmary-Ban	2014-08-15	1	-28/+1
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT ME...	Chelsea Derrick	2014-08-11	1	-22/+0
\| * \| \|	Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev	Vinit Deshpande	2014-08-09	3	-150/+1
\| \|\ \ \ \|/ / / /
\| * \| \|	Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE	Vinit Deshpande	2014-08-10	3	-150/+1
* \| \| \|	Support EAP-SIM and EAP-AKA	Vinit Deshpande	2014-08-08	2	-4/+3
\|/ / /
* \| \|	Merge "Unhide broadcasts for WiFi network changes." into lmp-dev	Chelsea Derrick	2014-08-07	1	-0/+7
\|\ \ \
\| * \| \|	Unhide broadcasts for WiFi network changes.	Chelsea Derrick	2014-08-07	1	-0/+7
* \| \| \|	Read/Write numBssidsPerScan in ParcelableScanResults	Vinit Deshpande	2014-08-07	1	-1/+3
\|/ / /
* \| \|	Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev	Zoltan Szatmary-Ban	2014-08-07	1	-1/+28
\|\ \ \