frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 0237d04b: am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile e...	Jean-Baptiste Queru	2012-06-08	1	-0/+1
\|\
\| *	am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension"	Jean-Baptiste Queru	2012-06-08	1	-0/+1
\| \|\
\| \| *	am 3e3d641c: Merge "Added mpga as valid MediaFile extension"	Jean-Baptiste Queru	2012-06-08	1	-0/+1
\| \| \|\
\| \| \| *	Added mpga as valid MediaFile extension	Mathias Franzén	2012-06-05	1	-0/+1
\| \| * \|	am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"	Jean-Baptiste Queru	2012-05-25	1	-2/+2
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"	Jean-Baptiste Queru	2012-05-25	1	-2/+2
\| \| \| \|\
\| \| \| \| *	stagefright aacenc: Fix reading out of bounds in pow2_xy	Martin Storsjo	2012-05-25	1	-2/+2
\| \| * \| \|	am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"	Jean-Baptiste Queru	2012-05-24	1	-3/+3
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "libstagefright/matroska: Fix build with gcc 4.7"	Jean-Baptiste Queru	2012-05-24	1	-3/+3
\| \| \| \|\ \
\| \| \| \| * \|	libstagefright/matroska: Fix build with gcc 4.7	Bernhard Rosenkraenzer	2012-03-29	1	-3/+3
\| \| * \| \| \|	am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"	Jean-Baptiste Queru	2012-05-24	1	-3/+3
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "libmedia: Fix build with gcc 4.7"	Jean-Baptiste Queru	2012-05-24	1	-3/+3
\| \| \| \|\ \ \ \| \| \| \| \|/ / \| \| \| \| \| / \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| \| *	libmedia: Fix build with gcc 4.7	Bernhard Rosenkraenzer	2012-03-29	1	-3/+3
\| \| * \| \|	am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to ...	Jean-Baptiste Queru	2012-05-21	3	-9/+9
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"	Jean-Baptiste Queru	2012-05-21	3	-9/+9
\| \| \| \|\ \
\| \| \| \| * \|	stagefright avcenc: Use intptr_t for casting pointers to integers	Martin Storsjo	2012-04-13	3	-9/+9
\| \| \| \| \|/
\| \| * \| \|	am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right...	Jean-Baptiste Queru	2012-05-21	2	-53/+50
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "stagefright avcenc: Switch tmp variables to use the right type, to avo...	Jean-Baptiste Queru	2012-05-21	2	-53/+50
\| \| \| \|\ \
\| \| \| \| * \|	stagefright avcenc: Switch tmp variables to use the right type, to avoid casting	Martin Storsjo	2012-04-13	2	-53/+50
\| \| \| \| \|/
\| \| * \| \|	am 00f94e88: Merge "Enable chromium http stack for x86"	Jean-Baptiste Queru	2012-05-03	1	-2/+4
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Enable chromium http stack for x86	Jun Tian	2012-05-02	1	-2/+4
\| \| * \| \|	am 1b34c1bc: Merge "stagefright: Remove useless declarations"	Jean-Baptiste Queru	2012-05-01	1	-11/+0
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "stagefright: Remove useless declarations"	Jean-Baptiste Queru	2012-05-01	1	-11/+0
\| \| \| \|\ \
\| \| \| \| * \|	stagefright: Remove useless declarations	Martin Storsjo	2012-04-16	1	-11/+0
\| \| \| \| \|/
* \| \| \| \|	am 765d3d13: am fca9ff38: Merge "rename exif to exif_jni due to refactoring i...	Keun young Park	2012-06-07	2	-1/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev	Keun young Park	2012-06-07	2	-1/+4
\| \|\ \ \ \
\| \| * \| \| \|	rename exif to exif_jni due to refactoring in external/jhead	Keun young Park	2012-06-07	2	-1/+4
* \| \| \| \| \|	am dbb9e386: am 6a5f9f6d: Merge "Configuration for lock and UI sound levels" ...	Jean-Michel Trivi	2012-06-07	1	-8/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Configuration for lock and UI sound levels" into jb-dev	Jean-Michel Trivi	2012-06-07	1	-8/+4
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Configuration for lock and UI sound levels	Jean-Michel Trivi	2012-06-05	1	-8/+4
* \| \| \| \| \|	am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" ...	Marco Nelissen	2012-06-06	1	-0/+7
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Ensure we compute display name when needed	Marco Nelissen	2012-06-06	1	-0/+7
* \| \| \| \| \|	am b8da1c90: am 88a89b29: Merge "Always queue A2DP connection state message w...	Jean-Michel Trivi	2012-06-06	1	-4/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Always queue A2DP connection state message with wakelock held	Jean-Michel Trivi	2012-06-06	1	-4/+5
* \| \| \| \| \|	resolved conflicts for merge of 1178569b to master	Adam Powell	2012-06-05	1	-4/+72
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	More fun with MediaRouter	Adam Powell	2012-06-05	1	-4/+72
* \| \| \| \| \|	am 1d340500: am 0c01222f: Merge "Don\'t crash when scaling Bitmaps with priva...	Jack Palevich	2012-06-05	1	-1/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Don't crash when scaling Bitmaps with private Bitmap.Configs	Jack Palevich	2012-06-04	1	-1/+5
\| \|/ / / /
* \| \| \| \|	am 58e29c06: am 7c86958d: Merge "Add MediaRouter API." into jb-dev	Adam Powell	2012-06-03	1	-0/+875
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Add MediaRouter API." into jb-dev	Adam Powell	2012-06-03	1	-0/+875
\| \|\ \ \ \
\| \| * \| \| \|	Add MediaRouter API.	Adam Powell	2012-06-01	1	-0/+875
* \| \| \| \| \|	am 0b5f8ac1: am 56f6c7ff: Merge "Fix b/6575950 make shader program to support...	Ruei-sung Lin	2012-06-02	7	-76/+106
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Fix b/6575950 make shader program to support different precisions." in...	Ruei-sung Lin	2012-06-01	7	-76/+106
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Fix b/6575950 make shader program to support different precisions.	Ruei-sung Lin	2012-05-29	7	-76/+106
* \| \| \| \| \|	am c7d8d370: am b40c0b5a: Merge "Handle wakelocks for device connection inten...	Jean-Michel Trivi	2012-06-01	1	-7/+16
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Handle wakelocks for device connection intents from AudioService	Jean-Michel Trivi	2012-05-31	1	-7/+16
* \| \| \| \| \|	am c383b407: am cee7203f: Merge "Send device connection intents from AudioSer...	Eric Laurent	2012-05-31	3	-50/+166
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Send device connection intents from AudioService" into jb-dev	Eric Laurent	2012-05-31	3	-50/+166
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Send device connection intents from AudioService	Eric Laurent	2012-05-30	3	-50/+166
\| \| \|/ / / /
* \| \| \| \| \|	am 9ff7d5db: am 7b996d19: Fix a test case failure when there is no back-facin...	James Dong	2012-05-30	1	-51/+53
\|\ \ \ \ \ \ \| \|/ / / / /