frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am f6c66902: Merge "util: Make Rational a Number/Comparable; add Range#inRang...	Igor Murashkin	2014-06-07	2	-23/+558
\|\
\| *	Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-p...	Igor Murashkin	2014-06-07	2	-23/+558
\| \|\
\| \| *	util: Make Rational a Number/Comparable; add Range#inRange	Igor Murashkin	2014-06-06	2	-23/+558
* \| \|	am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into...	Dongwon Kang	2014-06-06	3	-56/+159
\|\ \ \ \| \|/ /
\| * \|	Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev	Dongwon Kang	2014-06-06	3	-56/+159
\| \|\ \
\| \| * \|	TIF: Address the feedback from the API review - 2/3	Jae Seo	2014-06-06	3	-56/+159
* \| \| \|	am 77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into...	Dongwon Kang	2014-06-06	5	-55/+59
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev	Dongwon Kang	2014-06-06	5	-55/+59
\| \|\ \ \ \| \| \|/ /
\| \| * \|	TIF: Address the feedback from the API review - 1/3	Jae Seo	2014-06-05	5	-55/+59
\| \| \|/
* \| \|	am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into ...	Ji-Hwan Lee	2014-06-05	1	-0/+83
\|\ \ \ \| \|/ /
\| * \|	Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev	Ji-Hwan Lee	2014-06-05	1	-0/+83
\| \|\ \
\| \| * \|	TvContract: Add channel logo and program thumbnail	Ji-Hwan Lee	2014-06-06	1	-0/+83
* \| \| \|	am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-p...	Alan Viverette	2014-06-05	1	-1/+6
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Add defaults for caption colors and edge type" into lmp-preview-dev	Alan Viverette	2014-06-05	1	-1/+6
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Add defaults for caption colors and edge type	Alan Viverette	2014-06-04	1	-1/+6
\| \| \|/
* \| \|	resolved conflicts for merge of f8272896 to master	Elliott Hughes	2014-06-05	1	-6/+7
\|\ \ \
\| * \ \	am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."	Elliott Hughes	2014-06-05	1	-6/+7
\| \|\ \ \
\| \| * \| \|	[LP64] Fix access to MediaAlbumArt.	Elliott Hughes	2014-06-05	1	-6/+7
* \| \| \| \|	Merge "AudioAttributes: parcelable, hide support for tags"	Jean-Michel Trivi	2014-06-05	1	-1/+48
\|\ \ \ \ \
\| * \| \| \| \|	AudioAttributes: parcelable, hide support for tags	Jean-Michel Trivi	2014-06-04	1	-1/+48
* \| \| \| \| \|	am e637e614: Merge "remove debug log in AudioPortEventHandler." into lmp-prev...	Eric Laurent	2014-06-05	1	-1/+0
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev	Eric Laurent	2014-06-05	1	-1/+0
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| \| * \| \| \|	remove debug log in AudioPortEventHandler.	Eric Laurent	2014-06-04	1	-1/+0
* \| \| \| \| \|	am dd76759d: Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev	Eric Laurent	2014-06-04	2	-9/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev	Eric Laurent	2014-06-04	2	-9/+5
\| \|\ \ \ \ \
\| \| * \| \| \| \|	AudioManager: fix AudioPort gain query	Eric Laurent	2014-06-02	2	-9/+5
\| \| \|/ / / /
* \| \| \| \| \|	am 65d95bfa: Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged...	Dongwon Kang	2014-06-04	5	-17/+153
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| / / / \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks fr...	Dongwon Kang	2014-06-03	5	-17/+153
\| \|\ \ \ \
\| \| * \| \| \|	Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS ...	Dongwon Kang	2014-06-03	5	-17/+153
* \| \| \| \| \|	Merge "Update android.media.AudioTrack.getTimestamp API documentation"	Glenn Kasten	2014-06-03	1	-0/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update android.media.AudioTrack.getTimestamp API documentation	Glenn Kasten	2014-05-29	1	-0/+2
* \| \| \| \| \| \|	Merge "AudioFormat class"	Jean-Michel Trivi	2014-06-03	1	-0/+152
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	AudioFormat class	Jean-Michel Trivi	2014-06-02	1	-0/+152
* \| \| \| \| \| \| \|	am 594ac157: Merge "TvContract: Address the feedback from the API review" int...	Jae Seo	2014-06-03	1	-46/+110
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge "TvContract: Address the feedback from the API review" into lmp-preview...	Jae Seo	2014-06-03	1	-46/+110
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	TvContract: Address the feedback from the API review	Jae Seo	2014-06-02	1	-46/+110
* \| \| \| \| \| \| \|	am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and Sett...	Chulwoo Lee	2014-06-03	2	-1/+126
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Add a way to get the class name of SetupActivity and SettingsActivity	Chulwoo Lee	2014-06-03	2	-1/+126
\| \|/ / / / / /
* \| \| \| \| \| \|	resolved conflicts for merge of ebe661c4 to master	Jae Seo	2014-06-03	19	-0/+3536
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Put TV Input Framework under android.media.tv, including TvContract	Jae Seo	2014-06-02	19	-0/+3536
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrec...	Mike Lockwood	2014-06-02	1	-1/+1
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name...	Mike Lockwood	2014-06-02	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."	Mike Lockwood	2014-06-02	1	-1/+1
\| \| \|\ \ \ \
\| \| \| * \| \| \|	MtpDatabase JNI: Fixed incorrect method name in ALOGE.	Martin Blumenstingl	2014-05-31	1	-1/+1
* \| \| \| \| \| \|	am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory...	Mike Lockwood	2014-06-02	1	-4/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getO...	Mike Lockwood	2014-06-02	1	-4/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectProperty...	Mike Lockwood	2014-06-02	1	-4/+2
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().	Martin Blumenstingl	2014-05-31	1	-4/+2
\| * \| \| \| \| \|	am a034dac7: android_media_MediaMuxer_setLocation: amended signature.	Robert Shih	2014-05-30	1	-1/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	android_media_MediaMuxer_setLocation: amended signature.	Robert Shih	2014-05-30	1	-1/+1