frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Timed text display format support: 1. Extract 3GPP global format descr...	Gloria Wang	2011-06-22	2	-5/+667
\|\
\| *	Timed text display format support:	Gloria Wang	2011-06-22	2	-5/+667
* \|	Switch to use MediaMetadataRetriever to generate the project thumbnail when t...	James Dong	2011-06-21	1	-6/+27
\|/
*	MTP: Add support for PTP variant of GetDeviceInfo result.	Mike Lockwood	2011-06-21	1	-3/+3
*	MTP: Fix some problems with GetObjectHandles and GetNumObjects commands	Mike Lockwood	2011-06-17	1	-22/+68
*	Second attempt to fix the broken build	James Dong	2011-06-14	1	-1/+0
*	Fix broken build	James Dong	2011-06-14	1	-1/+1
*	Update MediaPlayer and MediaRecorder javadoc	James Dong	2011-06-14	2	-0/+31
*	Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.	tedbo	2011-06-13	1	-6/+27
*	MTP: Remove obsolete setPtpMode support	Mike Lockwood	2011-06-08	1	-5/+0
*	Merge "Add WebP Mime-Type support in Android Media File"	Marco Nelissen	2011-06-06	1	-1/+3
\|\
\| *	Add WebP Mime-Type support in Android Media File	Vikas Arora	2011-06-03	1	-1/+3
* \|	Add some comment to MediaRecorder.stop() about the stop() failure (-1007)	James Dong	2011-05-26	1	-0/+6
\|/
*	Extract embedded cover art (aka poster frame) in mp4 files	James Dong	2011-05-26	1	-1/+1
*	Merge "For out of band timed text support (timed text in a separate file)."	Gloria Wang	2011-05-25	1	-4/+16
\|\
\| *	For out of band timed text support (timed text in a separate file).	Gloria Wang	2011-05-25	1	-4/+16
* \|	Issue 4364098: bluetooth SCO not working	Eric Laurent	2011-05-25	1	-5/+1
* \|	Bluetooth SCO audio API improvements.	Eric Laurent	2011-05-25	2	-89/+258
\|/
*	Bug 4184736 unhide MediaPlayer.setTexture	Glenn Kasten	2011-05-20	1	-1/+6
*	Merge "Publish setLocation() method as a public Java API"	James Dong	2011-05-19	1	-5/+4
\|\
\| *	Publish setLocation() method as a public Java API	James Dong	2011-05-18	1	-5/+4
* \|	Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463...	Gloria Wang	2011-05-19	1	-0/+1
\|\ \ \| \|/ \|/\|
\| *	Add one more MIME type (audio/aac-adts) for aac file.	Gloria Wang	2011-05-19	1	-0/+1
* \|	am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId...	Mike Lockwood	2011-05-18	1	-7/+8
\|\ \ \| \|/ \|/\|
\| *	am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ...	Mike Lockwood	2011-05-17	1	-7/+8
\| \|\
\| \| *	StorageVolume: Add getStorageId() accessor	Mike Lockwood	2011-05-17	1	-7/+8
\| * \|	am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...	Dianne Hackborn	2011-05-16	1	-2/+2
\| \|\ \ \| \| \|/
\| \| *	Merge "DO NOT MERGE. Integrate from master: Rework display size access." int...	Dianne Hackborn	2011-05-16	1	-2/+2
\| \| \|\
\| \| \| *	DO NOT MERGE. Integrate from master: Rework display size access.	Dianne Hackborn	2011-05-16	1	-2/+2
* \| \| \|	Make track informational event optional, depending on system property	James Dong	2011-05-17	1	-0/+4
* \| \| \|	resolved conflicts for merge of b107f4de to master	Mike Lockwood	2011-05-16	1	-1/+12
\|\ \ \ \ \| \|/ / /
\| * \| \|	am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return corr...	Mike Lockwood	2011-05-16	1	-1/+12
\| \|\ \ \ \| \| \|/ /
\| \| * \|	MTP: Have GetStorageInfo command return correct storage type for removable st...	Mike Lockwood	2011-05-16	1	-1/+12
\| * \| \|	am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize sto...	Mike Lockwood	2011-05-16	1	-2/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	StorageManager: Clean up and generalize storage configuration resources	Mike Lockwood	2011-05-16	1	-2/+1
\| \| \|/
\| \| *	Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2	The Android Automerger	2011-05-08	2	-1/+12
\| \| \|\
\| \| * \|	DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...	Mike Lockwood	2011-05-03	1	-29/+37
\| \| * \|	DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...	Mike Lockwood	2011-05-03	2	-89/+108
\| \| * \|	DO NOT MERGE Fix media scanner uri handling.	Marco Nelissen	2011-05-03	1	-21/+13
\| \| * \|	DO NOT MERGE MTP and media provider support for multiple storage devices:	Mike Lockwood	2011-05-03	4	-46/+152
* \| \| \|	Support for storing geo information in the recorded mp4/3gpp file.	James Dong	2011-05-13	1	-0/+34
* \| \| \|	Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"	James Dong	2011-05-11	1	-7/+13
\|\ \ \ \
\| * \| \| \|	Fix setDataSource(Context, Uri, Map<String,String> headers)	Andreas Huber	2011-05-11	1	-7/+13
* \| \| \| \|	Expose the track informational event for testing	James Dong	2011-05-11	1	-2/+78
\|/ / / /
* \| \| \|	am 9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description f...	Scott Main	2011-05-06	2	-1/+12
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a ...	Scott Main	2011-05-06	2	-1/+12
\| \|\ \ \
\| \| * \ \	am 9f7054fe: Merge "docs: add package description for mtp and a little more i...	Scott Main	2011-05-06	2	-1/+12
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	docs: add package description for mtp and a little more info to MtpDevice	Scott Main	2011-05-05	2	-1/+12
\| \| \| \|/
\| * \| \|	am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art f...	Mike Lockwood	2011-05-04	1	-29/+37
\| \|\ \ \ \| \| \|/ /
\| \| * \|	DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...	Mike Lockwood	2011-05-04	1	-29/+37