frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	am 621c6adc: am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image ↵	Dirk Dougherty	2010-09-09	2	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and adt release date. Merge commit '621c6adcb765ab348eb0daf770d4c0eca65fd632' * commit '621c6adcb765ab348eb0daf770d4c0eca65fd632': Doc change: Fixes for toggle image and adt release date.
\| *	am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release ↵	Dirk Dougherty	2010-09-09	2	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	date. Merge commit 'a71d69947d4a74730b17021b4c809d054d66c741' into gingerbread-plus-aosp * commit 'a71d69947d4a74730b17021b4c809d054d66c741': Doc change: Fixes for toggle image and adt release date.
\| \| *	am 74a74d3c: Doc change: Fixes for toggle image and adt release date.	Dirk Dougherty	2010-09-09	2	-2/+2
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48' into gingerbread * commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48': Doc change: Fixes for toggle image and adt release date.
\| \| \| *	Doc change: Fixes for toggle image and adt release date.	Dirk Dougherty	2010-09-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2e76a42650c3ab54e597340cd96e4f7b23fe5116
* \| \| \|	Merge "Progress Dialog documentation example uses onPrepareDialog"	Gilles Debunne	2010-09-09	1	-6/+11
\|\ \ \ \
\| * \| \| \|	Progress Dialog documentation example uses onPrepareDialog	Gilles Debunne	2010-09-09	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7afebdb321e28d8e4b1687ba4f503bde7d6031a0
* \| \| \| \|	am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK ↵	Dirk Dougherty	2010-09-08	10	-40/+182
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tools r7 and ADT 0.9.8." into froyo Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50' * commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
\| * \| \| \|	am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ↵	Dirk Dougherty	2010-09-08	10	-40/+182
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ADT 0.9.8." into froyo Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp * commit 'ea68cab8a33d3169de33c7112000cd3dae233afe': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
\| \| * \| \|	am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." ↵	Dirk Dougherty	2010-09-08	10	-40/+182
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into froyo Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread * commit '3eb07ea483225974484c018d7d5affbf4815ceb2': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
\| \| \| * \|	Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo	Dirk Dougherty	2010-09-08	10	-40/+182
\| \| \| \|\ \
\| \| \| \| * \|	Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.	Dirk Dougherty	2010-09-08	10	-40/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
* \| \| \| \| \|	am c50a4f37: am 45cda90b: Merge "Be brief." into gingerbread	Elliott Hughes	2010-09-07	1	-182/+41
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77' * commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77': Be brief.
\| * \| \| \| \|	am 45cda90b: Merge "Be brief." into gingerbread	Elliott Hughes	2010-09-07	1	-182/+41
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp * commit '45cda90bdc178e253049c7067c78bf4b1204ba82': Be brief.
\| \| * \| \| \|	Merge "Be brief." into gingerbread	Elliott Hughes	2010-09-07	1	-182/+41
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Be brief.	Elliott Hughes	2010-07-28	1	-182/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Excise much of the non-Android blurb so we don't distract from our primary messages of "allocate less stuff" and "do less work". Change-Id: Ifc2c12bc953dbfbaf4078d4f7b77aa75d1d942d7
* \| \| \| \| \| \|	am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error	Scott Main	2010-09-03	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb' * commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb': fix code snippet error
\| * \| \| \| \| \|	am 2b136832: am c4367e54: fix code snippet error	Scott Main	2010-09-03	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp * commit '2b136832be7326caed0c79bae418c2dd54372bea': fix code snippet error
\| \| * \| \| \| \|	am c4367e54: fix code snippet error	Scott Main	2010-09-03	1	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread * commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3': fix code snippet error
\| \| \| * \| \| \|	fix code snippet error	Scott Main	2010-09-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
* \| \| \| \| \| \|	am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension ↵	Scott Main	2010-09-02	1	-4/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| / \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	description" into froyo Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c' * commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c': clarify dp dimension description
\| * \| \| \| \|	am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo	Scott Main	2010-09-02	1	-4/+7
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp * commit '3208557edca8c133fa32b7718acd22d77f1a9475': clarify dp dimension description
\| \| * \| \| \|	am c5083cdf: Merge "clarify dp dimension description" into froyo	Scott Main	2010-09-02	1	-4/+7
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread * commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879': clarify dp dimension description
\| \| \| * \| \|	Merge "clarify dp dimension description" into froyo	Scott Main	2010-09-02	1	-4/+7
\| \| \| \|\ \ \
\| \| \| \| * \| \|	clarify dp dimension description	Scott Main	2010-08-16	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I85152f8ab668984ca9db3a4f56c4f8a5ab6ebacd
* \| \| \| \| \| \|	Testing Documentation in the Dev Guide tab	Joe Malin	2010-08-27	12	-1068/+2179
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
* \| \| \| \| \| \|	am e339c096: am 9020595b: am f5287094: Fix closing tag in docs.	Brad Fitzpatrick	2010-08-27	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146' * commit 'e339c0968e781f28e0c690afc746ea3d16aba146': Fix closing tag in docs.
\| * \| \| \| \| \|	am 9020595b: am f5287094: Fix closing tag in docs.	Brad Fitzpatrick	2010-08-27	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp * commit '9020595b7f376bb414c9a6dba216dec76ababb17': Fix closing tag in docs.
\| \| * \| \| \| \|	am f5287094: Fix closing tag in docs.	Brad Fitzpatrick	2010-08-27	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread * commit 'f52870948d5d57d033fcdafc9c3fb0a872975447': Fix closing tag in docs.
\| \| \| * \| \| \|	Fix closing tag in docs.	Brad Fitzpatrick	2010-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BUG=2956223 Change-Id: I0772d0b5386a783762319064c13d567c124da394
* \| \| \| \| \| \|	Fix in fundamentals web page.	Gilles Debunne	2010-08-25	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
* \| \| \| \| \| \|	Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12"	Joe Malin	2010-08-24	1	-0/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12	Joe Malin	2010-07-30	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2f18641c8c18e2ca48d85c3231d50bc95dd74c0e
* \| \| \| \| \| \| \|	am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to ↵	Dirk Dougherty	2010-08-24	2	-37/+91
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd' * commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd': Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
\| * \| \| \| \| \| \|	am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch ↵	Dirk Dougherty	2010-08-23	2	-37/+91
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	modes and caution against using SingleTask and SingleInstance modes." into froyo Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp * commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196': Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
\| \| * \| \| \| \| \|	am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and ↵	Dirk Dougherty	2010-08-23	2	-37/+91
\| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	caution against using SingleTask and SingleInstance modes." into froyo Merge commit '397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread * commit '397c0f5a18281e3880b9359feab683a13d271a03': Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
\| \| \| * \| \| \| \|	Merge "Doc change: Add table to clarify launch modes and caution against ↵	Dirk Dougherty	2010-08-23	2	-37/+91
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using SingleTask and SingleInstance modes." into froyo
\| \| \| \| * \| \| \| \|	Doc change: Add table to clarify launch modes and caution against using ↵	Dirk Dougherty	2010-08-23	2	-37/+91
\| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SingleTask and SingleInstance modes. Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
* \| \| \| \| \| \| \|	am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for ↵	Scott Main	2010-08-24	6	-72/+502
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	getting user location" into froyo Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2' * commit '32b07fc6cab290466c010d05667940a9ba5672e2': docs: add dev guide for getting user location
\| * \| \| \| \| \| \|	am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user ↵	Scott Main	2010-08-23	6	-72/+502
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	location" into froyo Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp * commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9': docs: add dev guide for getting user location
\| \| * \| \| \| \| \|	am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo	Scott Main	2010-08-23	6	-72/+502
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '5a98fef352ed835406fa74a5563eadd9708f7cf9' into gingerbread * commit '5a98fef352ed835406fa74a5563eadd9708f7cf9': docs: add dev guide for getting user location
\| \| \| * \| \| \| \|	docs: add dev guide for getting user location	Scott Main	2010-08-20	6	-72/+502
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I63558c0304a632ccfbb7a80411ab23ad2c82b5c9
* \| \| \| \| \| \|	am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget ↵	Scott Main	2010-08-21	1	-6/+20
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	classes to tutorials" into froyo Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f' * commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f': docs: add links from widget classes to tutorials
\| * \| \| \| \| \|	am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to ↵	Scott Main	2010-08-19	1	-6/+20
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tutorials" into froyo Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp * commit '70c9ffbc838271f0ea27a4780eb146287de53ef6': docs: add links from widget classes to tutorials
\| \| * \| \| \| \|	am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo	Scott Main	2010-08-19	1	-6/+20
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread * commit '11a72482a0cdc45ceaf4ca83957e682381455aee': docs: add links from widget classes to tutorials
\| \| \| * \| \| \|	docs: add links from widget classes to tutorials	Scott Main	2010-08-19	1	-6/+20
\| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I817e885524951853182b0458df4a32dea1614243
* \| \| \| \| \|	am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for ↵	Trevor Johns	2010-08-12	1	-5/+5
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Developer Forums doc." into froyo Merge commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15' * commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15': Fix subscribe links for Developer Forums doc.
\| * \| \| \| \|	am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums ↵	Trevor Johns	2010-08-12	1	-5/+5
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc." into froyo Merge commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60' into gingerbread-plus-aosp * commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60': Fix subscribe links for Developer Forums doc.
\| \| * \| \| \|	am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo	Trevor Johns	2010-08-12	1	-5/+5
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread * commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795': Fix subscribe links for Developer Forums doc.
\| \| \| * \| \|	Fix subscribe links for Developer Forums doc.	Trevor Johns	2010-08-10	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The email-based subscribe links for the Android Developer forums do not work for two groups (android-discuss, android-beginners) due to recent changes in those groups. These links need to be changed to HTML-based subscribe links instead. For consistency, other links are being changed to use the HTML-based subscription mechanism as well. Internal Bug: 2908002 Change-Id: I601b959935584270d6107c4600b28ac5f51359e1
* \| \| \| \| \|	am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; ↵	Scott Main	2010-08-05	3	-3/+1
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add link to resource docs for ColorStateList class Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8' * commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8': fix some doc errors in the resources;