frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am c1ded373: Merge "Revert "Use pread() to get the decrypted data for contain...	James Dong	2011-05-25	1	-7/+0
\|\
\| *	Revert "Use pread() to get the decrypted data for container based DRM file."	James Dong	2011-05-25	1	-7/+0
* \|	am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.c...	Jeffrey Tinker	2011-05-23	2	-19/+19
\|\ \ \| \|/
\| *	Merge "Multi-repository checkin, goes with https://android-git.corp.google.co...	Jeffrey Tinker	2011-05-23	2	-19/+19
\| \|\
\| \| *	Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038	Jeffrey Tinker	2011-05-23	2	-19/+19
* \| \|	am a5293d1c: Add some logging to track down where ANR happens during MediaPla...	James Dong	2011-05-23	2	-1/+7
\|\ \ \ \| \|/ /
\| * \|	Add some logging to track down where ANR happens during MediaPlayer._release().	James Dong	2011-05-23	2	-1/+7
* \| \|	am a6f1104b: Use pread() to get the decrypted data for container based DRM fi...	Gloria Wang	2011-05-20	1	-0/+7
\|\ \ \ \| \|/ /
\| * \|	Use pread() to get the decrypted data for container based DRM file.	Gloria Wang	2011-05-20	1	-0/+7
\| \|/
* \|	am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ...	James Dong	2011-05-18	4	-29/+155
\|\ \ \| \|/
\| *	Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" in...	James Dong	2011-05-18	4	-29/+155
\| \|\
\| \| *	Using widevine:// to stream adaptive bitrate wvm content no longer	Andreas Huber	2011-05-10	4	-29/+155
* \| \|	am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...	Gloria Wang	2011-05-18	2	-8/+4
\|\ \ \ \| \|/ /
\| * \|	Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...	Gloria Wang	2011-05-18	2	-8/+4
\| \|\ \
\| \| * \|	DO NOT MERGE	Gloria Wang	2011-05-13	2	-8/+4
\| \| \|/
* \| \|	am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycom...	Mike Lockwood	2011-05-17	1	-7/+8
\|\ \ \ \| \|/ /
\| * \|	StorageVolume: Add getStorageId() accessor	Mike Lockwood	2011-05-17	1	-7/+8
* \| \|	am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even i...	Andreas Huber	2011-05-17	1	-1/+7
\|\ \ \ \| \|/ /
\| * \|	Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(code...	Andreas Huber	2011-05-17	1	-1/+7
\| \|\ \
\| \| * \|	DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-speci...	Andreas Huber	2011-05-04	1	-1/+7
* \| \| \|	am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...	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
\| \| \| \|/ \| \| \|/\|
* \| \| \|	am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...	Mike Lockwood	2011-05-16	4	-7/+30
\|\ \ \ \ \| \|/ / /
\| * \| \|	MTP: Have GetStorageInfo command return correct storage type for removable st...	Mike Lockwood	2011-05-16	4	-7/+30
* \| \| \|	am 0a93d875: Merge "StorageManager: Clean up and generalize storage configur...	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: Fix bug in "no media" handling logic	Mike Lockwood	2011-05-03	1	-3/+4
\| * \|	DO NOT MERGE MTP: Implement GetThumb command	Mike Lockwood	2011-05-03	7	-2/+100
\| * \|	DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions	Mike Lockwood	2011-05-03	2	-24/+29
\| * \|	DO NOT MERGE MTP: Add extended operations to support in-place editing of files	Mike Lockwood	2011-05-03	6	-38/+280
\| * \|	DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...	Mike Lockwood	2011-05-03	4	-121/+122
\| * \|	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	9	-104/+288
* \| \|	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
\| \|/
* \|	DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...	Mike Lockwood	2011-05-04	1	-29/+37
* \|	DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic	Mike Lockwood	2011-05-04	1	-3/+4
* \|	DO NOT MERGE MTP: Implement GetThumb command	Mike Lockwood	2011-05-04	7	-2/+100
* \|	DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions	Mike Lockwood	2011-05-04	2	-24/+29
* \|	DO NOT MERGE MTP: Add extended operations to support in-place editing of files	Mike Lockwood	2011-05-04	6	-38/+280
* \|	DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...	Mike Lockwood	2011-05-04	4	-121/+122
* \|	DO NOT MERGE Fix media scanner uri handling.	Marco Nelissen	2011-05-04	1	-21/+13
* \|	DO NOT MERGE MTP and media provider support for multiple storage devices:	Mike Lockwood	2011-05-04	9	-104/+288
* \|	am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.	James Dong	2011-04-29	2	-0/+12
\|\ \ \| \|/
\| *	Add avg bandwidth estimate every 2 seconds - do not merge.	James Dong	2011-04-28	2	-0/+12
* \|	am b0d6f10e: Bug 4167061 remove debugging code	Glenn Kasten	2011-04-13	1	-1/+1
\|\ \ \| \|/
\| *	Bug 4167061 remove debugging code	Glenn Kasten	2011-04-13	1	-1/+1