frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"	Jean-Baptiste Queru	2012-02-23	1	-3/+9
\|\
\| *	Fix for issue 9656 - custom xml attributes in Android Libraries	inazaruk	2011-05-28	1	-3/+9
* \|	Merge "Add stubs for improved compatibility"	Jean-Baptiste Queru	2012-02-22	6	-0/+107
\|\ \
\| * \|	Add stubs for improved compatibility	Jean-Baptiste Queru	2012-02-21	6	-0/+107
* \| \|	Merge "Xcode 4.3 compatibility checkin"	Jean-Baptiste Queru	2012-02-22	1	-3/+3
\|\ \ \
\| * \| \|	Xcode 4.3 compatibility checkin	Al Sutton	2012-02-19	1	-3/+3
* \| \| \|	Merge "The bigger touch slop still has a problem"	Jean-Baptiste Queru	2012-02-22	1	-2/+9
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	The bigger touch slop still has a problem	Masanori Ogino	2012-02-20	1	-2/+9
* \| \| \|	Merge "Call onTimeChanged when AM/PM changed."	Jean-Baptiste Queru	2012-02-21	1	-0/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Call onTimeChanged when AM/PM changed.	SeongJae Park	2012-02-14	1	-0/+2
\| \|/ /
* \| \|	Merge "Return error code when composing PDU fails"	Jean-Baptiste Queru	2012-02-17	1	-3/+1
\|\ \ \
\| * \| \|	Return error code when composing PDU fails	Matthias Thomae	2012-02-16	1	-3/+1
\| \|/ /
* \| \|	Merge "Add support for bmp and wav content types in MMS"	Jean-Baptiste Queru	2012-02-17	1	-0/+6
\|\ \ \
\| * \| \|	Add support for bmp and wav content types in MMS	Matthias Thomae	2011-06-09	1	-0/+6
* \| \| \|	Merge "Increase PDU parts buffer size for performance reasons"	Jean-Baptiste Queru	2012-02-17	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Increase PDU parts buffer size for performance reasons	Matthias Thomae	2012-02-17	1	-1/+1
\|/ / /
* \| \|	Merge "Fix incorrect prototype for JNI call"	Jean-Baptiste Queru	2012-02-13	1	-1/+1
\|\ \ \
\| * \| \|	Fix incorrect prototype for JNI call	Bhanu Chetlapalli	2012-01-31	1	-1/+1
* \| \| \|	Merge "Skia API changes as a result of an update to the Skia library."	Jean-Baptiste Queru	2012-02-06	2	-2/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Skia API changes as a result of an update to the Skia library.	Derek Sollenberger	2012-01-31	2	-2/+5
\|/ / /
* \| \|	Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"	Jean-Baptiste Queru	2012-01-27	1	-0/+4
\|\ \ \
\| * \| \|	Wi-Fi: Handle disconnect in middle of DHCP operation	Vishal Mahaveer	2012-01-27	1	-0/+4
\|/ / /
* \| \|	Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"	Jean-Baptiste Queru	2012-01-25	1	-3/+3
\|\ \ \
\| * \| \|	stagefright aacenc: Fix type definitions for 64 bit platforms	Martin Storsjo	2012-01-13	1	-3/+3
* \| \| \|	Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"	Jean-Baptiste Queru	2012-01-24	1	-2/+7
\|\ \ \ \
\| * \| \| \|	stagefright amrwbenc: Make the mem_malloc function 64-bit safe	Martin Storsjo	2012-01-13	1	-2/+7
\| \|/ / /
* \| \| \|	Merge "stagefright aacenc: Add missing newlines at the end of files"	Jean-Baptiste Queru	2012-01-24	13	-13/+13
\|\ \ \ \
\| * \| \| \|	stagefright aacenc: Add missing newlines at the end of files	Martin Storsjo	2012-01-13	13	-13/+13
\| \|/ / /
* \| \| \|	Merge "stagefright aacenc: Properly terminate a comment"	Jean-Baptiste Queru	2012-01-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	stagefright aacenc: Properly terminate a comment	Martin Storsjo	2012-01-13	1	-1/+1
\| \|/ / /
* \| \| \|	Merge "Rename LOG_ASSERT to ALOG_ASSERT"	Jean-Baptiste Queru	2012-01-19	13	-68/+68
\|\ \ \ \
\| * \| \| \|	Rename LOG_ASSERT to ALOG_ASSERT	Steve Block	2012-01-19	13	-68/+68
* \| \| \| \|	Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"	Jean-Baptiste Queru	2012-01-19	295	-1916/+1916
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	Steve Block	2012-01-19	295	-1916/+1916
* \| \| \| \|	Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"	Jean-Baptiste Queru	2012-01-19	135	-648/+648
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)	Steve Block	2012-01-19	135	-648/+648
* \| \| \| \|	Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"	Jean-Baptiste Queru	2012-01-19	104	-390/+390
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)	Steve Block	2012-01-19	104	-390/+390
* \| \| \| \|	Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"	Jean-Baptiste Queru	2012-01-19	135	-821/+821
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)	Steve Block	2012-01-19	135	-821/+821
* \| \| \| \|	Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)"	Jean-Baptiste Queru	2012-01-19	200	-3143/+3143
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)	Steve Block	2012-01-19	200	-3143/+3143
\|/ / / /
* \| \| \|	Merge "Rename (IF_)LOG() to (IF_)ALOG()"	Jean-Baptiste Queru	2012-01-19	9	-20/+20
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Rename (IF_)LOG() to (IF_)ALOG()	Steve Block	2012-01-18	9	-20/+20
\|/ / /
* \| \|	Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"	Jean-Baptiste Queru	2012-01-13	133	-5071/+5071
\|\ \ \
\| * \| \|	stagefright aacenc/amrwbenc: Remove trailing whitespace	Mans Rullgard	2012-01-12	133	-5071/+5071
\|/ / /
* \| \|	Fix Apache stack	John Reck	2012-01-11	1	-0/+1
* \| \|	Reconcile with ics-mr1-release	The Android Open Source Project	2011-12-16	0	-0/+0
\|\ \ \
\| * \| \|	SurfaceMediaSource: use the HW_TEXTURE usage bit	Jamie Gennis	2011-12-15	1	-1/+3
\| * \| \|	merge in ics-mr1-release history after reset to ics-mr1	The Android Automerger	2011-12-15	0	-0/+0
\| \|\ \ \