android_frameworks_wilhelm - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	am 609d361b: am e453cdbf: Reconcile with ics-mr1-release	The Android Open Source Project	2012-02-01	0	-0/+0
\|\ \
\| * \	am e453cdbf: Reconcile with ics-mr1-release	The Android Open Source Project	2012-02-01	0	-0/+0
\| \|\ \
\| \| * \	Reconcile with ics-mr1-release	The Android Open Source Project	2012-02-01	0	-0/+0
\| \| \|\ \
* \| \| \| \|	Use audio_source_t consistently	Glenn Kasten	2012-01-23	2	-2/+2
* \| \| \| \|	Merge "Use audio_stream_type_t consistently"	Glenn Kasten	2012-01-17	3	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	Use audio_stream_type_t consistently	Glenn Kasten	2012-01-06	3	-4/+4
* \| \| \| \| \|	Merge "Use audio_format_t consistently"	Glenn Kasten	2012-01-12	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use audio_format_t consistently	Glenn Kasten	2012-01-04	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge "Fix bug in use of getPositionUsec()"	Glenn Kasten	2012-01-09	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix bug in use of getPositionUsec()	Glenn Kasten	2012-01-06	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge "Minor improvements to test app"	Glenn Kasten	2012-01-09	1	-14/+107
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Minor improvements to test app	Glenn Kasten	2012-01-05	1	-14/+107
\| \|/ / / / /
* \| \| \| \| \|	Merge "Remove virtual from methods that don't need it"	Glenn Kasten	2012-01-09	1	-8/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove virtual from methods that don't need it	Glenn Kasten	2011-12-19	1	-8/+8
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	Steve Block	2012-01-08	3	-4/+4
* \| \| \| \| \|	Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE	Steve Block	2012-01-06	4	-6/+6
* \| \| \| \| \|	Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE	Steve Block	2012-01-04	1	-1/+1
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge "add a "long" type to MFF structs"	Rodrigo Carceroni	2011-12-29	0	-0/+0
\|\ \ \ \ \
* \ \ \ \ \	Merge "Cleanup CreateAudioPlayer and CreateMediaPlayer"	Glenn Kasten	2011-12-20	4	-55/+49
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Cleanup CreateAudioPlayer and CreateMediaPlayer	Glenn Kasten	2011-12-14	4	-55/+49
\| \|/ / / /
* \| \| \| \|	Merge "Consistent formatting for if ("	Glenn Kasten	2011-12-19	3	-5/+5
\|\ \ \ \ \
\| * \| \| \| \|	Consistent formatting for if (	Glenn Kasten	2011-12-12	3	-5/+5
\| \|/ / / /
* \| \| \| \|	Merge "Add curlies to if / else"	Glenn Kasten	2011-12-19	3	-5/+10
\|\ \ \ \ \
\| * \| \| \| \|	Add curlies to if / else	Glenn Kasten	2011-12-12	3	-5/+10
\| \|/ / / /
* \| \| \| \|	Merge "Remove redundant this->"	Glenn Kasten	2011-12-19	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Remove redundant this->	Glenn Kasten	2011-12-12	1	-2/+2
\| \|/ / / /
* \| \| \| \|	Merge "Extract out audio DSP primitives from AudioFlinger"	Glenn Kasten	2011-12-16	0	-0/+0
\|\\| \| \| \|
* \| \| \| \|	am 9f61907c: Reconcile with ics-mr1-release	The Android Open Source Project	2011-12-09	0	-0/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	Reconcile with ics-mr1-release	The Android Open Source Project	2011-12-08	0	-0/+0
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/
* \| \|	Reconcile with ics-mr1-release	The Android Open Source Project	2011-12-07	0	-0/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	merge in ics-mr1-release history after reset to ics-mr1	The Android Automerger	2011-12-06	0	-0/+0
\| \|\ \ \| \| \|/ \| \|/\|
* \| \|	am 28cd3686: Merge "CTS-like Test for Face Effects recording support" into ic...	Eddy Talvala	2011-12-06	0	-0/+0
\|\\| \|
\| * \|	Merge "CTS-like Test for Face Effects recording support" into ics-mr1	Eddy Talvala	2011-12-06	0	-0/+0
\| \|\ \
* \| \| \|	am b7b605ff: Reconcile with ics-mr0-release	The Android Open Source Project	2011-12-06	0	-0/+0
\|\\| \| \|
\| * \| \|	Reconcile with ics-mr0-release	The Android Open Source Project	2011-12-06	0	-0/+0
\| \|\ \ \
* \| \| \| \|	am 6b77115d: (-s ours) am 3e843769: DO NOT MERGE: Fix ordering of SurfaceText...	Eino-Ville Talvala	2011-11-30	0	-0/+0
\|\\| \| \| \|
\| * \| \| \|	am 3e843769: DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceT...	Eino-Ville Talvala	2011-11-30	0	-0/+0
\| \|\\| \| \| \| \| \|/ / \| \|/\| \|
* \| \| \|	Reconcile with ics-mr1-release	The Android Open Source Project	2011-11-30	0	-0/+0
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	merge in ics-mr1-release history after reset to ics-mr1	The Android Automerger	2011-11-30	0	-0/+0
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
* \| \| \|	am 30f49ce0: Merge "Bug 5622637 missing XA_PLAYEVENT_HEADATPOS" into ics-mr1	Glenn Kasten	2011-11-30	1	-0/+6
\|\\| \| \|
\| * \| \|	Merge "Bug 5622637 missing XA_PLAYEVENT_HEADATPOS" into ics-mr1	Glenn Kasten	2011-11-29	1	-0/+6
\| \|\ \ \
\| \| * \| \|	Bug 5622637 missing XA_PLAYEVENT_HEADATPOS	Glenn Kasten	2011-11-29	1	-0/+6
* \| \| \| \|	resolved conflicts for merge of 2917f475 to master	Jean-Michel Trivi	2011-11-30	4	-10/+48
\|\\| \| \| \|
\| * \| \| \|	Fix bug 5553055 support video only format change in MP2TS	Jean-Michel Trivi	2011-11-29	4	-10/+48
* \| \| \| \|	am 7898a5c5: Reflect (internal) API changes made to the IStreamSource interface.	Andreas Huber	2011-11-29	1	-1/+5
\|\\| \| \| \|
\| * \| \| \|	Reflect (internal) API changes made to the IStreamSource interface.	Andreas Huber	2011-11-29	1	-1/+5
\| \|/ / /
* \| \| \|	Merge "Bug fixes and cleanup for video codec profiles"	Glenn Kasten	2011-11-29	4	-31/+61
\|\ \ \ \
\| * \| \| \|	Bug fixes and cleanup for video codec profiles	Glenn Kasten	2011-11-29	4	-31/+61
* \| \| \| \|	Merge "Remove AudioTrackProxy since AudioTrack is RefBase"	Glenn Kasten	2011-11-29	5	-82/+5
\|\ \ \ \ \
\| * \| \| \| \|	Remove AudioTrackProxy since AudioTrack is RefBase	Glenn Kasten	2011-11-16	5	-82/+5