summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
|\
| * Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
| |\
| | * Remove obsolete TARGET_SIMULATOR checksTrevor Drake2014-12-111-24/+11
* | | am f1b12df3: Merge "Trigger error only when a template is instantiated."Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ | |/ /
| * | 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
* | | am cf1e3bb2: Merge "Fix AAC recording issue"Marco Nelissen2014-12-101-1/+2
|\ \ \ | |/ /
| * | Merge "Fix AAC recording issue"Marco Nelissen2014-12-101-1/+2
| |\ \ | | |/ | |/|
| | * Fix AAC recording issueMarco Nelissen2014-12-101-1/+2
| |/
* | am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \ | |/
| * Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| |\
| | * Truncate file before recording into it.Marco Nelissen2014-12-101-0/+3
* | | am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
|\ \ \ | |/ /
| * | Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
| |\ \
| | * | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
| |/ /
* | | am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
|\ \ \ | |/ /
| * | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| |\ \
| | * | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2737-98/+98
* | | | am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| |\ \ \
| | * | | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
* | | | | am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| |\ \ \ \
| | * | | | Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
| | |/ / /
* | | | | am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| |\ \ \ \
| | * | | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| | | |/ / | | |/| |
* | | | | am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| |/ / /
* | | | am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in OutputPortSet...Lajos Molnar2014-12-041-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedS...Lajos Molnar2014-12-041-0/+1
| |\ \ \
| | * | | libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
* | | | | am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
| |\ \ \ \
| | * | | | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
| |/ / / /
* | | | | am 5458756a: Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
| |\ \ \ \
| | * | | | Track volume should be maintained even if track is restoredseunghak.han2014-12-011-1/+5
| | | |/ / | | |/| |
* | | | | am 592f3bc8: Merge "Added support for YEAR metadata key from VorbisComments"Glenn Kasten2014-12-011-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Added support for YEAR metadata key from VorbisComments"Glenn Kasten2014-12-011-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Added support for YEAR metadata key from VorbisCommentsAndreas Lillvik2014-11-111-0/+1
* | | | | am 1a9c3954: Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
| |\ \ \ \
| | * | | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2543-241/+95
* | | | | | am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortD...Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
| |\ \ \ \ \
| | * | | | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
* | | | | | | am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
| |\ \ \ \ \ \