frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser methods to return...	Eino-Ville Talvala	2015-02-03	1	-4/+4
\|\
\| *	Merge "camera2: fix various BpCameraDeviceUser methods to return correct resu...	Eino-Ville Talvala	2015-02-03	1	-4/+4
\| \|\
\| \| *	camera2: fix various BpCameraDeviceUser methods to return correct result.	John Lin	2015-02-03	1	-4/+4
\| \|/
* \|	am 434c80e5: Merge "Add missing includes."	Elliott Hughes	2015-01-30	1	-0/+1
\|\ \ \| \|/
\| *	Merge "Add missing includes."	Elliott Hughes	2015-01-30	1	-0/+1
\| \|\
\| \| *	Add missing includes.	Elliott Hughes	2015-01-29	1	-0/+1
\| \|/
* \|	am 2a6e5cf4: Merge "Fix uninitialized variable."	Marco Nelissen	2015-01-29	1	-1/+3
\|\ \ \| \|/
\| *	Merge "Fix uninitialized variable."	Marco Nelissen	2015-01-29	1	-1/+3
\| \|\
\| \| *	Fix uninitialized variable.	Marco Nelissen	2015-01-29	1	-1/+3
* \| \|	am 166776fb: Merge "Add missing includes."	Elliott Hughes	2015-01-29	4	-0/+5
\|\ \ \ \| \|/ /
\| * \|	Merge "Add missing includes."	Elliott Hughes	2015-01-29	4	-0/+5
\| \|\ \
\| \| * \|	Add missing includes.	Elliott Hughes	2015-01-28	4	-0/+5
\| \| \|/
* \| \|	am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source fi...	Andreas Gampe	2015-01-28	1	-2/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Avoid mixing declarations and statements in C89 source files"	Andreas Gampe	2015-01-28	1	-2/+1
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Avoid mixing declarations and statements in C89 source files	Martin Storsjo	2014-12-30	1	-2/+1
* \| \|	am 47deb15e: Merge "Remove MediaPlayerService::decode()"	Marco Nelissen	2015-01-27	14	-1920/+13
\|\ \ \ \| \|/ /
\| * \|	Merge "Remove MediaPlayerService::decode()"	Marco Nelissen	2015-01-27	14	-1920/+13
\| \|\ \
\| \| * \|	Remove MediaPlayerService::decode()	Marco Nelissen	2015-01-26	14	-1920/+13
* \| \| \|	am cbb803a5: Merge "Remove superfluous OpenSSL include paths."	Kenny Root	2015-01-26	9	-16/+7
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Remove superfluous OpenSSL include paths."	Kenny Root	2015-01-26	9	-16/+7
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Remove superfluous OpenSSL include paths.	Adam Langley	2015-01-22	9	-16/+7
\| \|/ /
* \| \|	am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio policy: fix output device ...	Eric Laurent	2015-01-20	0	-0/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "DO NOT MERGE - audio policy: fix output device command after clearing ...	Eric Laurent	2015-01-20	1	-4/+8
\| \|\ \
\| \| * \|	DO NOT MERGE - audio policy: fix output device command after clearing audio p...	Eric Laurent	2015-01-20	1	-4/+8
\| \|/ /
* \| \|	am 1efe46de: Merge "Fix id3 parser crash"	Marco Nelissen	2015-01-15	1	-2/+9
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix id3 parser crash"	Marco Nelissen	2015-01-15	1	-2/+9
\| \|\ \
\| \| * \|	Fix id3 parser crash	Marco Nelissen	2015-01-15	1	-2/+9
\| \|/ /
* \| \|	am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"	Marco Nelissen	2015-01-13	19	-942/+446
\|\ \ \ \| \|/ /
\| * \|	Merge "Replace MidiFile player with a Midi extractor"	Marco Nelissen	2015-01-13	19	-942/+446
\| \|\ \
\| \| * \|	Replace MidiFile player with a Midi extractor	Marco Nelissen	2015-01-08	19	-942/+446
* \| \| \|	am a2d2c48a: Merge "Don\'t signal an error at the end of a short file"	Marco Nelissen	2015-01-09	1	-19/+11
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Don't signal an error at the end of a short file"	Marco Nelissen	2015-01-09	1	-19/+11
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Don't signal an error at the end of a short file	Marco Nelissen	2014-12-23	1	-19/+11
\| \| \|/
* \| \|	am c52af00b: Merge "Use callbacks for Midi I/O"	Marco Nelissen	2015-01-08	9	-64/+147
\|\ \ \ \| \|/ /
\| * \|	Merge "Use callbacks for Midi I/O"	Marco Nelissen	2015-01-08	9	-64/+147
\| \|\ \
\| \| * \|	Use callbacks for Midi I/O	Marco Nelissen	2015-01-08	9	-64/+147
\| \|/ /
* \| \|	am 43637c2e: Merge "fix memory leak in PatchPanel"	Eric Laurent	2015-01-05	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Merge "fix memory leak in PatchPanel"	Eric Laurent	2015-01-05	1	-0/+2
\| \|\ \
\| \| * \|	fix memory leak in PatchPanel	soon1.choi	2015-01-05	1	-0/+2
\| \| \|/
* \| \|	am 75afcc1f: Merge "Use define for drm property keys instead of defining as c...	Marco Nelissen	2015-01-05	1	-5/+5
\|\ \ \ \| \|/ /
\| * \|	Merge "Use define for drm property keys instead of defining as char pointers"	Marco Nelissen	2015-01-05	1	-5/+5
\| \|\ \
\| \| * \|	Use define for drm property keys instead of defining as char pointers	Martin Storsjo	2014-12-18	1	-5/+5
* \| \| \|	am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."	Narayan Kamath	2015-01-05	2	-5/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Remove hardcoded ICU & OpenSSL include paths."	Narayan Kamath	2015-01-05	2	-5/+0
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Remove hardcoded ICU & OpenSSL include paths.	Narayan Kamath	2015-01-05	2	-5/+0
\| \|/ /
* \| \|	am bd08223c: Merge "Fix double close."	Marco Nelissen	2014-12-22	2	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix double close."	Marco Nelissen	2014-12-22	2	-1/+1
\| \|\ \
\| \| * \|	Fix double close.	Bao Haojun	2014-05-17	2	-1/+1
* \| \| \|	am 1ec00eab: (-s ours) Merge "DO NOT MERGE - NuPlayer: open audio sink in off...	Eric Laurent	2014-12-18	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming...	Eric Laurent	2014-12-18	3	-5/+36
\| \|\ \ \