summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixes for GSM decoderMarco Nelissen2015-02-192-3/+28
* Add dumpsys infoMarco Nelissen2015-02-184-4/+104
* Merge "Move AString's StringPrintf out of the way."Elliott Hughes2015-02-0414-54/+54
|\
| * Move AString's StringPrintf out of the way.Elliott Hughes2015-02-0414-54/+54
|/
* Merge "camera2: fix various BpCameraDeviceUser methods to return correct resu...Eino-Ville Talvala2015-02-031-4/+4
|\
| * camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-02-031-4/+4
|/
* Merge "Add missing includes."Elliott Hughes2015-01-301-0/+1
|\
| * Add missing includes.Elliott Hughes2015-01-291-0/+1
|/
* Merge "Fix uninitialized variable."Marco Nelissen2015-01-291-1/+3
|\
| * Fix uninitialized variable.Marco Nelissen2015-01-291-1/+3
* | Merge "Add missing includes."Elliott Hughes2015-01-294-0/+5
|\ \
| * | Add missing includes.Elliott Hughes2015-01-284-0/+5
| |/
* | Merge "Avoid mixing declarations and statements in C89 source files"Andreas Gampe2015-01-281-2/+1
|\ \ | |/ |/|
| * Avoid mixing declarations and statements in C89 source filesMartin Storsjo2014-12-301-2/+1
* | Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2714-1920/+13
|\ \
| * | Remove MediaPlayerService::decode()Marco Nelissen2015-01-2614-1920/+13
* | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
|\ \ \ | |/ / |/| |
| * | Remove superfluous OpenSSL include paths.Adam Langley2015-01-229-16/+7
|/ /
* | Merge "DO NOT MERGE - audio policy: fix output device command after clearing ...Eric Laurent2015-01-201-4/+8
|\ \
| * | DO NOT MERGE - audio policy: fix output device command after clearing audio p...Eric Laurent2015-01-201-4/+8
|/ /
* | Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
|\ \
| * | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
|/ /
* | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
|\ \
| * | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-0819-942/+446
* | | Merge "Don't signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
|\ \ \ | |/ / |/| |
| * | Don't signal an error at the end of a short fileMarco Nelissen2014-12-231-19/+11
| |/
* | Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-089-64/+147
|\ \
| * | Use callbacks for Midi I/OMarco Nelissen2015-01-089-64/+147
|/ /
* | Merge "fix memory leak in PatchPanel"Eric Laurent2015-01-051-0/+2
|\ \
| * | fix memory leak in PatchPanelsoon1.choi2015-01-051-0/+2
| |/
* | Merge "Use define for drm property keys instead of defining as char pointers"Marco Nelissen2015-01-051-5/+5
|\ \
| * | Use define for drm property keys instead of defining as char pointersMartin Storsjo2014-12-181-5/+5
* | | Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-052-5/+0
|\ \ \ | |_|/ |/| |
| * | Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-052-5/+0
|/ /
* | Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
|\ \
| * | Fix double close.Bao Haojun2014-05-172-1/+1
* | | Merge "DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming...Eric Laurent2014-12-183-5/+36
|\ \ \
| * | | DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from t...Ronghua Wu2014-12-183-5/+36
* | | | Merge "DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed."Eric Laurent2014-12-182-0/+8
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-12-182-0/+8
|/ / /
* | | Merge "Fix wrong int argument of FOURCC."Chih-Hung Hsieh2014-12-171-4/+4
|\ \ \ | |_|/ |/| |
| * | Fix wrong int argument of FOURCC.Chih-Hung Hsieh2014-12-161-4/+4
|/ /
* | Merge "DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()"Eric Laurent2014-12-161-5/+2
|\ \
| * | DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()Eric Laurent2014-12-161-5/+2
|/ /
* | Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
|\ \
| * | Remove obsolete TARGET_SIMULATOR checksTrevor Drake2014-12-111-24/+11
* | | Merge "Trigger error only when a template is instantiated."Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ | |/ / |/| |
| * | Trigger error only when a template is instantiated.Chih-Hung Hsieh2014-12-111-6/+3
* | | Merge "Fix AAC recording issue"Marco Nelissen2014-12-101-1/+2
|\ \ \ | |/ / |/| |
| * | Fix AAC recording issueMarco Nelissen2014-12-101-1/+2
|/ /