frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE	Irfan Sheriff	2011-06-22	1	-3/+32
\|\
\| *	resolved conflicts for merge of 914ed90f to honeycomb-LTE	Irfan Sheriff	2011-06-22	1	-3/+32
\| \|\
\| \| *	Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""	Irfan Sheriff	2011-06-21	1	-3/+32
* \| \|	am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE...	Irfan Sheriff	2011-06-22	1	-32/+3
\|\ \ \ \| \|/ /
\| * \|	resolved conflicts for merge of 267a6181 to honeycomb-LTE	Irfan Sheriff	2011-06-22	1	-32/+3
\| \|\ \ \| \| \|/
\| \| *	DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"	Irfan Sheriff	2011-06-21	1	-32/+3
* \| \|	Updates resulting from the Skia merge (revision 1327)	Derek Sollenberger	2011-06-13	2	-17/+3
* \| \|	am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.	Martijn Coenen	2011-06-07	1	-0/+13
\|\ \ \
\| * \ \	am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.	Martijn Coenen	2011-06-01	1	-0/+13
\| \|\ \ \
\| \| * \| \|	Prevent allocation overflows by corrupt NDEF records.	Martijn Coenen	2011-05-31	1	-0/+13
* \| \| \| \|	am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad g...	Jeff Brown	2011-05-25	4	-0/+232
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO ...	Jeff Brown	2011-05-25	4	-0/+232
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)	Jeff Brown	2011-05-25	4	-0/+232
* \| \| \| \|	am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability....	Jeff Brown	2011-05-25	6	-28/+223
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERG...	Jeff Brown	2011-05-25	6	-28/+223
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Improve VelocityTracker numerical stability. (DO NOT MERGE)	Jeff Brown	2011-05-23	6	-28/+223
* \| \| \| \|	am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adopt...	Dianne Hackborn	2011-05-20	1	-5/+37
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into h...	Dianne Hackborn	2011-05-20	1	-5/+37
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Add ParcelFileDescriptor.fromFd() and .adoptFd().	Dianne Hackborn	2011-05-20	1	-5/+37
* \| \| \| \|	am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register...	Jaikumar Ganesh	2011-05-20	1	-1/+1
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge "Use proper type for oob variable in register_agent. Without this chang...	Jaikumar Ganesh	2011-05-20	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Use proper type for oob variable in register_agent.	Nicu Pavel	2011-05-05	1	-1/+1
\| * \| \| \| \|	Adapt to latest skia	Derek Sollenberger	2011-05-12	4	-5/+2
* \| \| \| \| \|	am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.	Dianne Hackborn	2011-05-19	2	-1/+17
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 69cb8757: Add new "-swNNNdp" resource qualifier.	Dianne Hackborn	2011-05-19	2	-1/+17
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Add new "-swNNNdp" resource qualifier.	Dianne Hackborn	2011-05-19	2	-1/+17
* \| \| \| \| \|	am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors	Mike Lockwood	2011-05-19	1	-0/+22
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am a88b42d5: USB: Add method to access raw USB device descriptors	Mike Lockwood	2011-05-19	1	-0/+22
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	USB: Add method to access raw USB device descriptors	Mike Lockwood	2011-05-19	1	-0/+22
* \| \| \| \| \|	am 59b1a4ed: Switch to use netd to add/remove routes.	Robert Greenwalt	2011-05-18	1	-60/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Switch to use netd to add/remove routes.	Robert Greenwalt	2011-05-18	1	-60/+0
* \| \| \| \| \|	am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...	Dianne Hackborn	2011-05-16	1	-8/+8
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...	Dianne Hackborn	2011-05-16	1	-8/+8
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	DO NOT MERGE. Integrate from master: Rework display size access.	Dianne Hackborn	2011-05-16	1	-8/+8
* \| \| \| \| \|	am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improv...	Dianne Hackborn	2011-05-16	1	-1/+34
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity ma...	Dianne Hackborn	2011-05-16	1	-1/+34
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.	Dianne Hackborn	2011-05-13	1	-1/+34
* \| \| \| \| \|	am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen widt...	Dianne Hackborn	2011-05-13	1	-1/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "...	Dianne Hackborn	2011-05-13	1	-1/+4
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	DO NOT MERGE. Integrate add new screen width/height in "dp" configs.	Dianne Hackborn	2011-05-12	1	-1/+4
\| \| * \| \| \|	Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2	Irfan Sheriff	2011-05-12	1	-3/+32
\| \| \|\ \ \ \
\| \| \| * \| \| \|	DO NOT MERGE Add DhcpStateMachine	Irfan Sheriff	2011-05-12	1	-3/+32
\| * \| \| \| \| \|	Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE	The Android Automerger	2011-05-08	1	-1/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	DO NOT MERGE Handle GET_POWER failures	Irfan Sheriff	2011-05-06	1	-1/+3
\| \| \|/ / / /
* \| \| \| \| \|	am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop"	Jean-Baptiste Queru	2011-05-12	3	-0/+106
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Ninepatch tweaks for better interop	Jean-Baptiste Queru	2011-05-12	3	-0/+106
\| * \| \| \| \|	Switch to SkSafeUnref for better portability	Jean-Baptiste Queru	2011-05-12	10	-13/+13
* \| \| \| \| \|	am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures	Irfan Sheriff	2011-05-04	1	-1/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 1a5b6098: Handle GET_POWER failures	Irfan Sheriff	2011-05-04	1	-1/+3
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Handle GET_POWER failures	Irfan Sheriff	2011-05-04	1	-1/+3