summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
* Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedS...Lajos Molnar2014-12-041-0/+1
|\
| * libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+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
|/ /
* | 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
* | | 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
* | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
|\ \ \
| * | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2543-241/+95
* | | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \
| * | | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
* | | | | Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \
| * | | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
|/ / / / /
* | | | | Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
|\ \ \ \ \
| * | | | | Img_utils: Fix "unused" variablesAndreas Gampe2014-11-242-2/+2
| | |/ / / | |/| | |
* | | | | Merge "Libcpustats: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \ \
| * | | | | Libcpustats: Remove unused variableAndreas Gampe2014-11-251-1/+0
|/ / / / /
* | | | | Merge "Remove unused parameter"chh2014-11-251-1/+1
|\ \ \ \ \
| * | | | | Remove unused parameterBernhard Rosenkränzer2014-11-181-1/+1
* | | | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
| | |/ / / | |/| | |
* | | | | Merge "Stagefright: Fix default typo"Andreas Gampe2014-11-241-2/+2
|\ \ \ \ \
| * | | | | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
|/ / / / /
* | | | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
|\ \ \ \ \
| * | | | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
* | | | | | Merge "C++11 compatibility."Dan Albert2014-11-209-24/+32
|\ \ \ \ \ \
| * | | | | | C++11 compatibility.Dan Albert2014-11-209-24/+32
| | |/ / / / | |/| | | |
* | | | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
|/ / / / /
* | | | | Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\ \ \ \ \
| * | | | | Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
* | | | | | Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
|\ \ \ \ \ \
| * | | | | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
| |/ / / / /
* | | | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ \ \
| * | | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
|/ / / / /
* | | | | Merge "No need to #include atomic-inline.h if you have atomic.h."Elliott Hughes2014-11-171-1/+0
|\ \ \ \ \
| * | | | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
|/ / / / /
* | | | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
|\ \ \ \ \
| * | | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1713-15/+14
* | | | | | Merge "libcutils no longer requires that its users configure ANDROID_SMP."Elliott Hughes2014-11-172-9/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-172-9/+0
|/ / / / /
* | | | | Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
|\ \ \ \ \
| * | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1755-145/+143
|/ / / / /
* | | | | Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \ \ \
| * | | | | Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
|/ / / / /
* | | | | Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |