frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Resolved conflicts for merge of 2bd6afed to master	Jason Chen	2010-10-08	4	-0/+498
\|\
\| *	am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin...	Fred Chung	2010-10-05	4	-0/+497
\| \|\
\| \| *	am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into f...	Fred Chung	2010-10-05	4	-0/+497
\| \| \|\
\| \| \| *	Merge "Doc change: Adding new docs for Device Admin API." into froyo	Fred Chung	2010-10-05	4	-0/+497
\| \| \| \|\
\| \| \| \| *	Doc change: Adding new docs for Device Admin API.	Katie McCormick	2010-10-04	4	-0/+497
* \| \| \| \|	am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more countr...	Scott Main	2010-10-05	2	-5/+7
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am c692792e: am 46ffeb21: docs: update homepage with more countries for marke...	Scott Main	2010-10-04	2	-5/+7
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 46ffeb21: docs: update homepage with more countries for market announcement	Scott Main	2010-10-04	2	-5/+7
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	docs: update homepage with more countries for market announcement	Scott Main	2010-10-04	2	-5/+7
* \| \| \| \|	Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new do...	Scott Main	2010-10-05	7	-0/+1330
\|\ \ \ \ \
\| * \| \| \| \|	docs: Rewrite of App Fundamentals.. Part 1.	Scott Main	2010-10-05	7	-0/+1330
* \| \| \| \| \|	am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd...	Scott Main	2010-10-05	1	-13/+0
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a7...	Scott Main	2010-10-04	1	-13/+0
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63f...	Scott Main	2010-10-04	1	-13/+0
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| * \| \|	docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38	Scott Main	2010-10-04	1	-13/+0
* \| \| \| \| \|	resolved conflicts for merge of 7008b7c1 to master	Scott Main	2010-10-04	33	-167/+232
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| / / \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	am ae1864c0: am ec80d7f3: docs: consistency fixit for the quickview boxes in ...	Scott Main	2010-10-04	33	-167/+232
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide	Scott Main	2010-10-04	33	-167/+232
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	docs: consistency fixit for the quickview boxes in the dev guide	Scott Main	2010-10-04	33	-167/+232
* \| \| \| \|	am 44fad94a: am 30f57295: am ba944ccd: Doc change: update screens support tab...	Dirk Dougherty	2010-10-04	3	-237/+235
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 30f57295: am ba944ccd: Doc change: update screens support table and remove...	Dirk Dougherty	2010-10-04	3	-237/+235
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am ba944ccd: Doc change: update screens support table and remove outdated den...	Dirk Dougherty	2010-10-04	4	-238/+236
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Doc change: update screens support table and remove outdated density/size met...	Dirk Dougherty	2010-10-04	4	-238/+236
* \| \| \| \|	am de5e6afb: am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1	Scott Main	2010-10-01	1	-19/+19
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1	Scott Main	2010-10-01	1	-19/+19
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 32441bbe: docs: device dashboard update for 10/1	Scott Main	2010-10-01	1	-19/+19
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	docs: device dashboard update for 10/1	Scott Main	2010-10-01	1	-19/+19
\| \| \| \|/
\| * \| \|	am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.	Chris Palmer	2010-09-27	1	-34/+42
\| \|\ \ \ \| \| \|/ /
\| \| * \|	DO NOT MERGE Clarify the explanation of Android's security design.	Chris Palmer	2010-09-27	1	-34/+42
* \| \| \|	Merge "Clarify the explanation of Android's security design."	Chris Palmer	2010-09-26	1	-34/+42
\|\ \ \ \
\| * \| \| \|	Clarify the explanation of Android's security design.	Chris Palmer	2010-09-24	1	-34/+42
* \| \| \| \|	Merge "Fix up some issues with the onCreateContextMenu example in the Notepad...	Bill Napier	2010-09-23	2	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	Fix up some issues with the onCreateContextMenu example in the Notepad tutorial.	Bill Napier	2010-09-15	2	-4/+4
* \| \| \| \| \|	am 85662b8e: am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/su...	Dirk Dougherty	2010-09-23	4	-13/+47
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." in...	Dirk Dougherty	2010-09-23	4	-13/+47
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread	Dirk Dougherty	2010-09-23	4	-13/+47
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Doc change: ADT 0.9.9 version notes, size/sum update.	Dirk Dougherty	2010-09-23	4	-13/+47
* \| \| \| \| \| \|	am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state...	Scott Main	2010-09-23	1	-9/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawabl...	Scott Main	2010-09-23	1	-9/+9
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am 5b7328f2: Merge "docs: add more info about state list drawable and onclick...	Scott Main	2010-09-23	1	-9/+9
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| / \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| * \| \|	Merge "docs: add more info about state list drawable and onclick attribute to...	Scott Main	2010-09-23	1	-9/+9
\| \| \| \|\ \ \
\| \| \| \| * \| \|	docs: add more info about state list drawable and onclick attribute to Button	Scott Main	2010-09-22	1	-9/+9
\| \| \| * \| \| \|	Doc change: ADT 0.9.9 version notes, size/sum update.	Dirk Dougherty	2010-09-23	4	-9/+43
\| \| \| \|/ / /
* \| \| \| \| \|	Merge "Doc Change: add screenshots to Testing in Eclipse topic"	Joe Malin	2010-09-17	3	-8/+86
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Doc Change: add screenshots to Testing in Eclipse topic	Joe Malin	2010-09-10	3	-8/+86
* \| \| \| \| \| \|	Fix broken javadoc.	Joe Onorato	2010-09-16	1	-1/+1
* \| \| \| \| \| \|	am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." ...	Dirk Dougherty	2010-09-16	8	-22/+17
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread	Dirk Dougherty	2010-09-16	8	-22/+17
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread	Dirk Dougherty	2010-09-16	8	-22/+17
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Doc change: clean up droiddoc (cs) macros.	Dirk Dougherty	2010-09-16	8	-22/+17