frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 4b94c451 to stage-korg-master	Jean-Baptiste Queru	2010-12-13	1	-0/+33
\|\
\| *	Added dropbox broadcast notification	Hakan Still	2010-12-08	1	-1/+34
* \|	am d9334934: Merge "Update of DRM Framework."	Gloria Wang	2010-11-22	1	-33/+39
\|\ \ \| \|/
\| *	Update of DRM Framework.	Takeshi Aimi	2010-11-19	1	-33/+39
* \|	resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp	Jean-Baptiste Queru	2010-11-17	1	-0/+50
\|\ \ \| \|/
\| *	Added buildQuery and buildUnionSubQuery methods without misleading selectionA...	Jonas Schwertfeger	2010-11-12	1	-1/+51
* \|	am 05434e9f: Final API 9. Really! Honestly! I hope.	Dianne Hackborn	2010-11-16	1	-27/+27
\|\ \
\| * \|	Final API 9. Really! Honestly! I hope.	Dianne Hackborn	2010-11-16	1	-27/+27
* \| \|	am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.	Jesse Wilson	2010-11-09	1	-15/+15
\|\ \ \ \| \|/ /
\| * \|	Add @Deprecated to match @deprecated where it's missing.	Jesse Wilson	2010-11-09	1	-15/+15
* \| \|	am a48b70fa: Camera.open() should only return back-facing camera.	Wu-cheng Li	2010-11-08	2	-20/+13
\|\ \ \ \| \|/ /
\| * \|	Camera.open() should only return back-facing camera.	Wu-cheng Li	2010-11-09	2	-20/+13
* \| \|	am 17ae3597: Revert "android.hardware.Camera.open only returns back-facing ca...	Wu-cheng Li	2010-11-08	1	-0/+10
\|\ \ \ \| \|/ /
\| * \|	Revert "android.hardware.Camera.open only returns back-facing camera."	Wu-cheng Li	2010-11-09	1	-0/+10
* \| \|	am 07b88fef: android.hardware.Camera.open only returns back-facing camera.	Wu-cheng Li	2010-11-08	1	-10/+0
\|\ \ \ \| \|/ /
\| * \|	android.hardware.Camera.open only returns back-facing camera.	Wu-cheng Li	2010-11-08	1	-10/+0
* \| \|	am 0467b0ab: Merge "Add a new public API to support recording rotated videos"...	James Dong	2010-11-06	1	-0/+13
\|\ \ \ \| \|/ /
\| * \|	Add a new public API to support recording rotated videos	James Dong	2010-11-05	1	-0/+13
* \| \|	am ef8a810b: Merge "Update of DRM framework"	Gloria Wang	2010-11-02	1	-115/+17
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Update of DRM framework	Takeshi Aimi	2010-11-02	1	-115/+17
* \| \|	am ccb75a88: Merge "Update the API file." into gingerbread	Dan Bornstein	2010-11-01	1	-12/+12
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Update the API file.	Dan Bornstein	2010-11-01	1	-12/+12
* \| \|	am 70a2c15e: Final SDK API 9. DO NOT MERGE.	Dianne Hackborn	2010-10-29	1	-236/+24508
\|\ \ \ \| \|/ /
\| * \|	Final SDK API 9. DO NOT MERGE.	Dianne Hackborn	2010-10-29	1	-236/+24508
* \| \|	am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread	Nick Pelly	2010-10-29	1	-610/+6
\|\ \ \ \| \|/ /
\| * \|	Hide some NFC API's.	Nick Pelly	2010-10-28	1	-610/+6
* \| \|	am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s n...	Dianne Hackborn	2010-10-24	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Fix issue #3126018: No way to specify NativeActivity's native method	Dianne Hackborn	2010-10-24	1	-2/+2
* \| \|	am 07f3bee2: Push Tag/NdefTag implementation details into the service.	Nick Pelly	2010-10-22	1	-22/+64
\|\ \ \ \| \|/ /
\| * \|	Push Tag/NdefTag implementation details into the service.	Nick Pelly	2010-10-22	1	-22/+64
* \| \|	am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread	Dianne Hackborn	2010-10-22	1	-11/+11
\|\ \ \ \| \|/ /
\| * \|	Fix issue #3122240: Expose xlarge in GB.	Dianne Hackborn	2010-10-22	1	-11/+11
* \| \|	am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." ...	Jeff Hamilton	2010-10-22	1	-0/+34
\|\ \ \ \| \|/ /
\| * \|	Unhide some NFC APIs that are required for the Tag app.	Jeff Hamilton	2010-10-21	1	-0/+34
* \| \|	am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.	Jeff Hamilton	2010-10-21	1	-0/+13
\|\ \ \ \| \|/ /
\| * \|	Backport ParcelFileDescriptor.createPipe() from master.	Jeff Hamilton	2010-10-21	1	-0/+13
* \| \|	am ba501785: Merge "Implement issue #3116702: New manifest tags for supported...	Dianne Hackborn	2010-10-21	1	-0/+33
\|\ \ \ \| \|/ /
\| * \|	Implement issue #3116702: New manifest tags for supported screen sizes DO NO...	Dianne Hackborn	2010-10-21	1	-0/+33
* \| \|	am 7ea5c45e: NFC settings cleanup.	Nick Pelly	2010-10-21	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	NFC settings cleanup.	Nick Pelly	2010-10-21	1	-1/+1
* \| \|	am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread	Hung-ying Tyan	2010-10-20	1	-45/+0
\|\ \ \ \| \|/ /
\| * \|	Remove ringtone API from SipAudioCall.	Hung-ying Tyan	2010-10-20	1	-45/+0
* \| \|	am dd7341f7: Added missing implementation for NdefRecord.	Sylvain Fonteneau	2010-10-18	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Added missing implementation for NdefRecord.	Sylvain Fonteneau	2010-10-18	1	-0/+2
* \| \|	am 3d2818d3: Remove public resource padding.	Dianne Hackborn	2010-10-18	1	-3235/+1
\|\ \ \ \| \|/ /
\| * \|	Remove public resource padding.	Dianne Hackborn	2010-10-18	1	-3235/+1
* \| \|	am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utilit...	Brad Fitzpatrick	2010-10-18	1	-0/+11
\|\ \ \ \| \|/ /
\| * \|	StrictMode: fix docs to actually compile and add a utility method.	Brad Fitzpatrick	2010-10-18	1	-0/+11
* \| \|	am e47150e9: Fix up NFC permissions.	Nick Pelly	2010-10-18	1	-0/+11
\|\ \ \ \| \|/ /
\| * \|	Fix up NFC permissions.	Nick Pelly	2010-10-18	1	-0/+11