frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 93552de8: Merge "stubs"	Jean-Baptiste Queru	2011-02-11	1	-0/+4
\|\
\| *	stubs	Steve Block	2011-02-11	1	-0/+4
* \|	am a6fb375c: am 056340ac: Merge "stubs"	Jean-Baptiste Queru	2011-01-31	3	-0/+88
\|\ \ \| \|/
\| *	Merge "stubs"	Jean-Baptiste Queru	2011-01-31	3	-0/+88
\| \|\
\| \| *	stubs	Jean-Baptiste Queru	2011-01-29	3	-0/+88
* \| \|	am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"	Dianne Hackborn	2011-01-29	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Normalize output from aapt d"	Dianne Hackborn	2011-01-29	1	-0/+1
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Normalize output from aapt d	Shachar Shemesh	2011-01-04	1	-0/+1
* \| \|	am 2ba92c71: do not merge bug 3370834 Cherrypick from master	Jean-Michel Trivi	2011-01-26	3	-5/+10
\|\ \ \
\| * \| \|	do not merge bug 3370834 Cherrypick from master	Jean-Michel Trivi	2011-01-26	3	-5/+10
* \| \| \|	am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OT...	Mathias Agopian	2011-01-25	1	-7/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)	Mathias Agopian	2011-01-25	1	-7/+1
* \| \| \|	am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflin...	Mathias Agopian	2011-01-25	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)	Mathias Agopian	2011-01-25	1	-1/+1
* \| \| \|	am 265cf2e7: Merge "Fix getSwitchState."	Jeff Brown	2011-01-22	1	-0/+9
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Fix getSwitchState.	Jeff Brown	2011-01-19	1	-0/+9
* \| \| \|	am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into ...	Jeff Brown	2011-01-18	1	-0/+17
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread	Jeff Brown	2011-01-18	1	-0/+17
\| \|\ \ \
\| \| * \| \|	Filter virtual keys after touches. (DO NOT MERGE)	Jeff Brown	2011-01-11	1	-0/+17
* \| \| \| \|	merge 83fdc69e from gingerbread - do not merge	Jean-Baptiste Queru	2011-01-14	3	-62/+10
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Squash commits of the following patches, cherry-picked from other branch - do...	James Dong	2011-01-12	3	-62/+10
\| \|/ / /
* \| \| \|	am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb...	James Dong	2011-01-10	1	-2/+7
\|\ \ \ \ \| \|/ / /
\| * \| \|	Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold...	James Dong	2011-01-10	1	-2/+7
* \| \| \|	am 0544d059: Merge "DRM Framework bug fixes."	Gloria Wang	2011-01-07	1	-0/+3
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge "DRM Framework bug fixes."	Gloria Wang	2011-01-07	1	-0/+3
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	DRM Framework bug fixes.	Takeshi Aimi	2010-11-30	1	-0/+3
* \| \| \|	am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and a...	Marco Nelissen	2011-01-06	2	-0/+2
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Add support for the "compilation" tag in mp3, mp4 and ogg, and also add	Marco Nelissen	2011-01-06	2	-0/+2
* \| \| \|	am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into ...	James Dong	2011-01-05	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Suppress the recording sound in the recorded video	James Dong	2011-01-04	1	-2/+2
* \| \| \|	am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread	Mathias Agopian	2010-12-07	2	-2/+16
\|\ \ \ \ \| \|/ / /
\| * \| \|	[3171580] Add transform field to native buffers. (DO NOT MERGE)	Mathias Agopian	2010-12-03	2	-2/+16
* \| \| \|	am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer allocati...	Mathias Agopian	2010-12-07	2	-1/+5
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	[3171580] don't automatically log GraphicBuffer allocation failures	Mathias Agopian	2010-12-03	2	-1/+5
* \| \|	am d9334934: Merge "Update of DRM Framework."	Gloria Wang	2010-11-22	2	-0/+123
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Update of DRM Framework.	Takeshi Aimi	2010-11-19	2	-0/+123
* \| \|	am 589e8381: Merge "Improve camera documentation." into gingerbread	Wu-cheng Li	2010-11-19	3	-17/+28
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Improve camera documentation.	Wu-cheng Li	2010-11-19	3	-17/+28
* \| \|	am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in t...	Jean-Baptiste Queru	2010-11-17	1	-1/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Framebuffer: Support variable number of framebuffers in the UI	Rodrigo Obregon	2010-11-03	1	-1/+2
* \| \|	am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" i...	James Dong	2010-11-08	1	-0/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Support extracting thumbnail from rotated video tracks	James Dong	2010-11-08	1	-0/+1
* \| \|	resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp	Andreas Huber	2010-11-08	3	-3/+15
\|\ \ \ \| \|/ /
\| * \|	Support post-decode video rotation.	Andreas Huber	2010-11-05	3	-3/+15
* \| \|	am 1653e261: Merge "Rotation support" into gingerbread	James Dong	2010-11-06	2	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Rotation support	James Dong	2010-11-05	2	-0/+2
* \| \|	am f3847e87: Merge "DO NOT MERGE" into gingerbread	James Dong	2010-11-03	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	DO NOT MERGE	James Dong	2010-11-02	1	-0/+1
* \| \|	am ef8a810b: Merge "Update of DRM framework"	Gloria Wang	2010-11-02	3	-23/+16
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Update of DRM framework	Takeshi Aimi	2010-11-02	3	-23/+16