frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp	Nick Pelly	2011-03-14	1	-1/+1
\|\
\| *	am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).	Nick Pelly	2011-03-10	1	-1/+1
\| \|\
\| \| *	Implement new NFC-EE API's as shared library (frameworks/base).	Nick Pelly	2011-03-10	1	-1/+1
\| * \|	am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread	Mike Lockwood	2011-03-02	1	-0/+1
\| \|\ \ \| \| \|/
\| \| *	DO NOT MERGE: Backport USB accessory support to gingerbread	Mike Lockwood	2011-03-01	1	-0/+1
* \| \|	Move USB framework support from android.hardware to android.hardware.usb package	Mike Lockwood	2011-03-01	1	-1/+1
* \| \|	fixing resource browser for renderscript samples because the samples moved	Robert Ly	2011-02-28	1	-2/+2
* \| \|	am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant...	Xavier Ducrohet	2011-02-28	1	-0/+1
\|\ \ \
\| * \ \	am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	1	-0/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	1	-0/+1
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	WAPPushManager, WAP Push over SMS message handler	noda	2011-02-18	1	-0/+1
* \| \| \|	am d2acfd6d: am a58f58da: Merge "Doc change: fixing renderscript samples" int...	Robert Ly	2011-02-17	1	-0/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Doc change: fixing renderscript samples	Robert Ly	2011-02-17	1	-0/+2
* \| \| \|	am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to ma...	Scott Main	2011-02-15	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: revise a couple sample app names to match side nav	Scott Main	2011-02-15	1	-2/+2
* \| \| \|	am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb	Adam Cohen	2011-02-11	1	-0/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Adding StackWidget sample code" into honeycomb	Adam Cohen	2011-02-11	1	-0/+2
\| \|\ \ \
\| \| * \| \|	Adding StackWidget sample code	Adam Cohen	2011-02-10	1	-0/+2
* \| \| \| \|	am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for c...	Winson Chung	2011-02-11	1	-0/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Associated changes for 'Adding sample for collection widgets backed by conten...	Winson Chung	2011-02-11	1	-0/+2
\| \|/ / /
* \| \| \|	am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample screensho...	Roman Nurik	2011-02-07	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Update resources data JSON, sample screenshot, and SDK makefile for Ho...	Roman Nurik	2011-02-07	1	-2/+2
\| \|\ \ \
\| \| * \| \|	Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb...	Roman Nurik	2011-02-07	1	-2/+2
* \| \| \| \|	am 236e9db9: am 62e97010: enable javadoc filtering for api level 11 and disab...	Scott Main	2011-02-07	1	-3/+3
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	enable javadoc filtering for api level 11 and disable preview doc mode	Scott Main	2011-02-07	1	-3/+3
\| \|/ / /
\| * \| \|	Merge ba3dd323 from gingerbread	Jean-Baptiste Queru	2011-01-29	1	-0/+1
\| \|\ \ \ \| \| \|/ /
* \| \| \|	am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plu...	Scott Main	2011-01-26	1	-0/+1
\|\ \ \ \
\| * \ \ \	resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp	Scott Main	2011-01-26	1	-0/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| / / \| \| \|/ /
\| \| * \|	enable preview mode for docs and add api level 10 flag for api level diffs	Scott Main	2011-01-26	1	-1/+6
* \| \| \|	New APIs for USB host support:	Mike Lockwood	2011-01-22	1	-0/+1
\|/ / /
* \| \|	Doc change: adding missing samples	Robert Ly	2011-01-19	1	-4/+6
* \| \|	Added Honeycomb-Gallery to docs.	Alexander Lucas	2011-01-19	1	-0/+2
* \| \|	Refactoring app widgets to address security/performance issues.	Winson Chung	2011-01-18	1	-0/+1
* \| \|	set sdk version to "Android 3.0" and api level to "Honeycomb"	Scott Main	2011-01-17	1	-4/+3
* \| \|	Import libcore_to_document definition from libcore/Docs.mk	Brian Carlstrom	2011-01-05	1	-11/+2
* \| \|	resolved conflicts for merge of 28e8c66d to master	Nick Pelly	2010-12-06	1	-2/+1
\|\ \ \ \| \|/ /
\| * \|	Merge branch gingerbread-nfc into gingerbread.	Nick Pelly	2010-12-05	1	-2/+1
\| \|\ \
\| \| * \|	Secure Element access implementation	Daniel Tomas	2010-11-19	1	-0/+1
\| \| * \|	Rough first pass at the NFC technology API.	Jeff Hamilton	2010-11-19	1	-2/+0
* \| \| \|	am f4c2eaf2: am 47ccfcb0: Doc change: add AccelerometerPlay to the generated ...	Dirk Dougherty	2010-11-29	1	-0/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Doc change: add AccelerometerPlay to the generated samples.	Dirk Dougherty	2010-11-29	1	-0/+2
* \| \| \|	am cb1af77f: am b1150edc: Remove HeavyWeight sample from generated html samples.	Dirk Dougherty	2010-11-29	1	-2/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Remove HeavyWeight sample from generated html samples.	Dirk Dougherty	2010-11-29	1	-2/+0
\| \| \|/ \| \|/\|
* \| \|	docs: add preview sdk docs to provide an api overview and install steps,	Scott Main	2010-11-29	1	-6/+3
* \| \|	am d3f19b86: am 210e9c4a: Merge "Revert "Disabling AccessibilityService sampl...	Trevor Johns	2010-11-24	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Revert "Disabling AccessibilityService sample from build system."	Trevor Johns	2010-11-24	1	-0/+2
* \| \|	am 4f3c40cc: am 8fac7c2e: change sdk version variable to 2.3 (for docs)	Scott Main	2010-11-22	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	change sdk version variable to 2.3 (for docs)	Scott Main	2010-11-22	1	-1/+1
\| * \|	Fixing build (DO NOT MERGE)	Megha Joshi	2010-11-12	1	-1/+1
\| * \|	Adding NFC sample resources (DO NOT MERGE)	Megha Joshi	2010-11-12	1	-0/+2
\| \|/