frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 381ac080 to master	Christopher Lane	2014-04-14	1	-23/+165
\|\
\| *	Add support for custom TXT records in NSD	Christopher Lane	2014-04-14	1	-23/+165
\| *	Harden NsdManager against null-dereference crashes	Dave Platt	2014-03-13	1	-19/+28
* \|	Document and enforce "one request per Listener" rule	Dave Platt	2014-03-31	1	-24/+58
* \|	am bf588bda: am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager ...	Dave Platt	2014-03-04	1	-19/+28
\|\ \
\| * \|	Harden NsdManager against null-dereference crashes	Dave Platt	2014-03-04	1	-19/+28
\| \|/
* \|	Remove unused imports from frameworks/base.	John Spurlock	2013-11-20	1	-2/+0
\|/
*	Fix sync problem in NsdManager	Robert Greenwalt	2013-05-02	1	-2/+1
*	Use Map for DnsSd TXT record	Irfan Sheriff	2012-05-09	1	-0/+1
*	API review fixes	Irfan Sheriff	2012-05-09	3	-414/+317
*	Fix build	Irfan Sheriff	2012-04-19	1	-2/+2
*	Add network service discovery broadcast	Irfan Sheriff	2012-04-19	1	-5/+1
*	Add user control to turn on/off nsd	Irfan Sheriff	2012-04-19	2	-2/+56
*	Merge "Open p2p pre-association service discovery API"	Irfan Sheriff	2012-04-17	1	-1/+0
\|\
\| *	Open p2p pre-association service discovery API	Irfan Sheriff	2012-04-14	1	-1/+0
* \|	Open network service discovery API	Irfan Sheriff	2012-04-15	2	-90/+264
\|/
*	Merge "Pre-association service discovery support"	Irfan Sheriff	2012-04-12	1	-1/+21
\|\
\| *	Pre-association service discovery support	Irfan Sheriff	2012-04-12	1	-1/+21
* \|	Bonjour fixes	Irfan Sheriff	2012-04-12	2	-17/+80
\|/
*	Fix build	Irfan Sheriff	2012-04-04	1	-0/+136
*	Add initial framework for DNS service discovery	Irfan Sheriff	2012-04-04	4	-269/+740
*	Original DnsSd TxtRecord file	Irfan Sheriff	2012-04-04	1	-0/+289