summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| | * | | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
| |/ / / / /
* | | | | | am 7877cb80: Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
| |\ \ \ \ \
| | * | | | | Img_utils: Fix "unused" variablesAndreas Gampe2014-11-242-2/+2
| | | |/ / / | | |/| | |
* | | | | | am d56a953a: Merge "Libcpustats: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Libcpustats: Remove unused variable"Andreas Gampe2014-11-251-1/+0
| |\ \ \ \ \
| | * | | | | Libcpustats: Remove unused variableAndreas Gampe2014-11-251-1/+0
| |/ / / / /
* | | | | | am e1b737ca: Merge "Remove unused parameter"chh2014-11-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Remove unused parameter"chh2014-11-251-1/+1
| |\ \ \ \ \
| | * | | | | Remove unused parameterBernhard Rosenkränzer2014-11-181-1/+1
* | | | | | | am 6c7d332f: Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
| | | |/ / / | | |/| | |
* | | | | | am e4f6ecb9: Merge "Stagefright: Fix default typo"Andreas Gampe2014-11-241-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Stagefright: Fix default typo"Andreas Gampe2014-11-241-2/+2
| |\ \ \ \ \
| | * | | | | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
| |/ / / / /
* | | | | | am db1ce33e: Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
| |\ \ \ \ \