frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "media: don't rely on Java 6 parseInt error on leading '+' sign"	Lajos Molnar	2014-04-16	1	-18/+19
\|\
\| *	media: don't rely on Java 6 parseInt error on leading '+' sign	Lajos Molnar	2014-04-16	1	-18/+19
* \|	am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"	Mark Salyzyn	2014-04-16	2	-10/+13
\|\ \ \| \|/ \|/\|
\| *	am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"	Mark Salyzyn	2014-04-16	2	-10/+13
\| \|\
\| \| *	frameworks: 64 bit compile issues	Mark Salyzyn	2014-04-16	2	-10/+13
* \| \|	am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"	Dmitriy Ivanov	2014-04-15	2	-34/+1
\|\ \ \ \| \|/ /
\| * \|	am 6ced3b34: am 0d54e471: Merge "Remove code markers"	Dmitriy Ivanov	2014-04-15	2	-34/+1
\| \|\ \ \| \| \|/
\| \| *	Remove code markers	Dmitriy Ivanov	2014-04-15	2	-34/+1
* \| \|	Merge "Implement USB Audio across Nexus Devices Fix issues with connecting no...	Paul McLean	2014-04-11	1	-14/+22
\|\ \ \
\| * \| \|	Implement USB Audio across Nexus Devices	Paul McLean	2014-04-11	1	-14/+22
* \| \| \|	Merge "Revert "Revert "Initial implementation of USB Audio output."""	Paul McLean	2014-04-11	2	-7/+25
\|\ \ \ \ \| \|/ / /
\| * \| \|	Revert "Revert "Initial implementation of USB Audio output.""	Paul McLean	2014-04-09	2	-7/+25
* \| \| \|	am c2bd3687: am 70bba904: am b093e485: Merge "generateProjectThumbnail can fa...	Elliott Hughes	2014-04-11	1	-3/+5
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close o...	Elliott Hughes	2014-04-11	1	-3/+5
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge "generateProjectThumbnail can fail to close output stream"	Elliott Hughes	2014-04-11	1	-3/+5
\| \| \|\ \
\| \| \| * \|	generateProjectThumbnail can fail to close output stream	Henrik Baard	2013-07-11	1	-3/+5
\| * \| \| \|	am 4995d725: Merge "Add signature\|system permission to MediaDrm signer APIs" ...	Jeff Tinker	2014-04-03	3	-42/+37
\| \|\ \ \ \
\| \| * \| \| \|	Add signature\|system permission to MediaDrm signer APIs	Jeff Tinker	2014-04-02	3	-42/+37
* \| \| \| \| \|	MediaFrameworkTest: Fix Camera2 API unit test build breakage	Zhijun He	2014-04-10	2	-37/+96
* \| \| \| \| \|	Merge "MediaFocusControl: fix comment"	Jean-Michel Trivi	2014-04-10	1	-4/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	MediaFocusControl: fix comment	Jean-Michel Trivi	2014-04-10	1	-4/+2
* \| \| \| \| \| \|	Camera2: Fix the JPEG format issues	Zhijun He	2014-04-09	1	-19/+117
\|/ / / / / /
* \| \| \| \| \|	Merge "Audio focus doesn't affect RemoteController"	Jean-Michel Trivi	2014-04-09	1	-164/+101
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Audio focus doesn't affect RemoteController	Jean-Michel Trivi	2014-04-08	1	-164/+101
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge "ImageReader: Fix raw buffer size calculation issue"	Zhijun He	2014-04-09	1	-2/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	ImageReader: Fix raw buffer size calculation issue	Zhijun He	2014-04-08	1	-2/+4
* \| \| \| \| \|	Revert "Initial implementation of USB Audio output."	Eric Laurent	2014-04-07	2	-25/+7
\|/ / / / /
* \| \| \| \|	Merge "Simplify and document AudioTrack gain"	Glenn Kasten	2014-04-04	1	-50/+67
\|\ \ \ \ \
\| * \| \| \| \|	Simplify and document AudioTrack gain	Glenn Kasten	2014-04-03	1	-50/+67
* \| \| \| \| \|	resolved conflicts for merge of 4f342e87 to master	Jeff Tinker	2014-04-03	3	-42/+37
\|/ / / / /
* \| \| \| \|	Merge "camera2: Fix out-of-date metadata test"	Igor Murashkin	2014-04-01	2	-2/+4
\|\ \ \ \ \
\| * \| \| \| \|	camera2: Fix out-of-date metadata test	Igor Murashkin	2014-04-01	2	-2/+4
* \| \| \| \| \|	am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" ...	Jeff Tinker	2014-04-01	11	-26/+490
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu...	Jeff Tinker	2014-04-01	11	-26/+490
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Support CAST V2 Authentication in MediaDrm	Jeff Tinker	2014-04-01	11	-26/+490
* \| \| \| \| \|	Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()"	Lajos Molnar	2014-04-01	1	-0/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	MediaCodec: avoid silent array overflow in queueSecureInputBuffer()	Lajos Molnar	2014-03-25	1	-0/+6
* \| \| \| \| \| \|	Merge "Don't ignore return value of setAuxEffectSendLevel()"	Glenn Kasten	2014-04-01	1	-4/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don't ignore return value of setAuxEffectSendLevel()	Glenn Kasten	2014-04-01	1	-4/+4
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge "Initial implementation of USB Audio output."	Paul McLean	2014-04-01	2	-7/+25
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Initial implementation of USB Audio output.	Paul McLean	2014-03-31	2	-7/+25
* \| \| \| \| \| \|	Merge "Synchronize channel masks in AudioFormat with system/audio.h"	Glenn Kasten	2014-03-31	1	-1/+8
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Synchronize channel masks in AudioFormat with system/audio.h	Glenn Kasten	2014-03-28	1	-1/+8
* \| \| \| \| \| \| \|	Merge "Fix typo"	Glenn Kasten	2014-03-31	1	-4/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix typo	Glenn Kasten	2014-03-28	1	-4/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t param...	Narayan Kamath	2014-03-31	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| / / / / \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"	Narayan Kamath	2014-03-31	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Cast CallMethod's size_t parameters to jint"	Narayan Kamath	2014-03-31	1	-2/+2
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Cast CallMethod's size_t parameters to jint	Ashok Bhat	2014-03-25	1	-2/+2
* \| \| \| \| \| \| \|	Remove SkOmxPixelRef to fix build.	Leon Scroggins	2014-03-27	5	-117/+0