frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge commit '2f7b69aa' into manualmerge	Scott Main	2010-02-03	1	-89/+302
\|\
\| *	am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the...	Scott Main	2010-02-03	1	-89/+302
\| \|\
\| \| *	Merge "docs: revise the Style and Themes document to improve the clarity of t...	Scott Main	2010-02-03	1	-89/+302
\| \| \|\
\| \| \| *	docs: revise the Style and Themes document to improve the	Scott Main	2010-02-03	1	-89/+302
* \| \| \|	am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into ec...	Megha Joshi	2010-02-03	3	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair	Megha Joshi	2010-02-03	3	-0/+0
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Screenshots for sample syncadapter." into eclair	Megha Joshi	2010-02-03	3	-0/+0
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Screenshots for sample syncadapter.	Megha Joshi	2010-02-03	3	-0/+0
* \| \| \|	am 1076ea0a: am 9800adf2: Merge "docs: update web page debugging with info ab...	Scott Main	2010-01-29	1	-20/+30
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 9800adf2: Merge "docs: update web page debugging with info about page and ...	Scott Main	2010-01-29	1	-20/+30
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "docs: update web page debugging with info about page and line numberin...	Scott Main	2010-01-29	1	-20/+30
\| \| \|\ \
\| \| \| * \|	docs: update web page debugging with info about page and line	Scott Main	2010-01-29	1	-20/+30
* \| \| \| \|	am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion desc...	Dirk Dougherty	2010-01-28	3	-27/+88
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add ...	Dirk Dougherty	2010-01-28	3	-27/+88
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	SDK doc change: fix android:glEsVersion description, add live_wallpaper featu...	Dirk Dougherty	2010-01-28	3	-27/+88
* \| \| \| \|	am 67a65856: am 965f4a6b: Merge "doc change only: Update announcement and mwc...	Dirk Dougherty	2010-01-28	2	-2/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to ...	Dirk Dougherty	2010-01-26	2	-2/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "doc change only: Update announcement and mwc redirect to point to micr...	Dirk Dougherty	2010-01-26	2	-2/+2
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| \| * \|	doc change only: Update announcement and mwc redirect to point to microsite.	Dirk Dougherty	2010-01-26	2	-2/+2
* \| \| \| \|	am 9985feca: am d243bc71: Merge "docs: reference the history JS file with doc...	Scott Main	2010-01-28	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am d243bc71: Merge "docs: reference the history JS file with docRoot in order...	Scott Main	2010-01-25	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "docs: reference the history JS file with docRoot in order to make offl...	Scott Main	2010-01-25	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	docs: reference the history JS file with docRoot in order to	Scott Main	2010-01-25	1	-1/+1
* \| \| \| \|	am 99988b6e: am 84207956: Merge "SDK doc change: Misc small fixes." into eclair	Dirk Dougherty	2010-01-28	1	-5/+5
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 84207956: Merge "SDK doc change: Misc small fixes." into eclair	Dirk Dougherty	2010-01-22	1	-5/+5
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "SDK doc change: Misc small fixes." into eclair	Dirk Dougherty	2010-01-22	1	-5/+5
\| \| \|\ \ \
\| \| \| * \| \|	SDK doc change: Misc small fixes.	Dirk Dougherty	2010-01-22	1	-5/+5
* \| \| \| \| \|	am 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" workarou...	Dirk Dougherty	2010-01-28	1	-4/+15
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connec...	Dirk Dougherty	2010-01-22	1	-4/+15
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "SDK doc change: Add "fetch by http" workaround for connection problems...	Dirk Dougherty	2010-01-22	1	-4/+15
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| \| * \| \|	SDK doc change: Add "fetch by http" workaround for connection problems in SDK...	Dirk Dougherty	2010-01-22	1	-4/+15
* \| \| \| \| \|	am 97ca28cd: am 5d14cb34: Merge "doc change: add announce for developer lab a...	Dirk Dougherty	2010-01-28	2	-7/+27
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move a...	Dirk Dougherty	2010-01-22	2	-7/+27
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "doc change: add announce for developer lab at mwc. move adc to carouse...	Dirk Dougherty	2010-01-22	2	-7/+27
\| \| \|\ \ \ \
\| \| \| * \| \| \|	doc change: add announce for developer lab at mwc. move adc to carousel.	Dirk Dougherty	2010-01-22	2	-7/+27
* \| \| \| \| \| \|	am 48edf7c0: am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."	Xavier Ducrohet	2010-01-25	2	-396/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."	Xavier Ducrohet	2010-01-20	2	-396/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Revert "SDK doc change: Add doc update for NDKr3."	Xavier Ducrohet	2010-01-20	2	-396/+1
* \| \| \| \| \| \|	am a0ecd4fb: am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." i...	Xavier Ducrohet	2010-01-25	2	-1/+396
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair	Xavier Ducrohet	2010-01-20	2	-1/+396
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge "SDK doc change: Add doc update for NDKr3." into eclair	Xavier Ducrohet	2010-01-20	2	-1/+396
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	SDK doc change: Add doc update for NDKr3.	Dirk Dougherty	2010-01-11	2	-1/+396
* \| \| \| \| \| \| \|	am bfb86068: am 2a79defa: Merge "docs: add guide to copying and installing th...	Scott Main	2010-01-25	1	-7/+19
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools a...	Scott Main	2010-01-20	1	-7/+19
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge "docs: add guide to copying and installing the Dev Tools app from the e...	Scott Main	2010-01-20	1	-7/+19
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| / \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	docs: add guide to copying and installing the Dev Tools app	Scott Main	2010-01-20	1	-7/+19
* \| \| \| \| \| \|	am 382f924c: am 5615ca19: docs: a lot of revision and expansion of the hello ...	Scott Main	2010-01-22	27	-973/+1537
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 5615ca19: docs: a lot of revision and expansion of the hello view tutorial...	Scott Main	2010-01-19	27	-973/+1537
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	docs: a lot of revision and expansion of the hello view tutorials	Scott Main	2010-01-19	27	-973/+1537
* \| \| \| \| \| \|	am 5ed68156: am de54a95b: Merge "docs: add a section about debugging web page...	Scott Main	2010-01-22	1	-108/+173
\|\ \ \ \ \ \ \ \| \|/ / / / / /