summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED...Chong Zhang2014-11-261-0/+2
|\
| * am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async mod...Chong Zhang2014-11-261-0/+2
| |\
| | * Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-m...Chong Zhang2014-11-261-0/+2
| | |\
| | | * MediaCodec: resume codec if state is FLUSHED in async modeChong Zhang2014-11-261-0/+2
* | | | am 5bf757cf: am 087eb332: Merge "audio policy: do not route accessibility pro...Eric Laurent2014-11-261-0/+15
|\ \ \ \ | |/ / /
| * | | am 087eb332: Merge "audio policy: do not route accessibility prompts to compr...Eric Laurent2014-11-261-0/+15
| |\ \ \ | | |/ /
| | * | Merge "audio policy: do not route accessibility prompts to compressed output"...Eric Laurent2014-11-261-0/+15
| | |\ \
| | | * | audio policy: do not route accessibility prompts to compressed outputEric Laurent2014-11-251-0/+15
* | | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-2617-341/+433
|\ \ \ \ \ | |/ / / /
| * | | | am 72bf901c: Merge "audio policy: new getOutputForAttr() prototype." into lmp...Eric Laurent2014-11-2617-341/+433
| |\ \ \ \ | | |/ / /
| | * | | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-2617-341/+433
| | |\ \ \ | | | |/ /
| | | * | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-2517-341/+433
* | | | | am 1e18795a: am d325005e: Merge "Fix AudioTrack loop mode to play audio from ...Andy Hung2014-11-262-4/+9
|\ \ \ \ \ | |/ / / /
| * | | | am d325005e: Merge "Fix AudioTrack loop mode to play audio from buffer start"...Andy Hung2014-11-252-4/+9
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix AudioTrack loop mode to play audio from buffer start" into lmp-mr1...Andy Hung2014-11-252-4/+9
| | |\ \ \
| | | * | | Fix AudioTrack loop mode to play audio from buffer startAndy Hung2014-11-242-4/+9
| | | | |/ | | | |/|
* | | | | am ec7b26f0: am 512dd849: Merge "camera: fix frame deletion logic in mInFligh...Zhijun He2014-11-261-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 512dd849: Merge "camera: fix frame deletion logic in mInFlightMap" into lm...Zhijun He2014-11-251-2/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "camera: fix frame deletion logic in mInFlightMap" into lmp-mr1-devZhijun He2014-11-251-2/+6
| | |\ \ \
| | | * | | camera: fix frame deletion logic in mInFlightMapRuchit Sharma2014-11-251-2/+6
| | | |/ /
* | | | | am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when sett...Lajos Molnar2014-11-261-12/+12
|\ \ \ \ \ | |/ / / /
| * | | | am b2cf160f: Merge "stagefright: add graceful handling when setting port defi...Lajos Molnar2014-11-251-12/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge "stagefright: add graceful handling when setting port definition" into ...Lajos Molnar2014-11-251-12/+12
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | stagefright: add graceful handling when setting port definitionLajos Molnar2014-11-251-12/+12
| | | |/
* | | | am fcf39e22: am 0f78eabb: fix the build.Eric Laurent2014-11-261-8/+1
|\ \ \ \ | |/ / /
| * | | am 0f78eabb: fix the build.Eric Laurent2014-11-251-8/+1
| |\ \ \ | | |/ /
| | * | fix the build.Eric Laurent2014-11-251-8/+1
* | | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-2612-54/+171
|\ \ \ \ | |/ / /
| * | | am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-2512-54/+171
| |\ \ \ | | |/ /
| | * | audio: new routing strategies and stream typesEric Laurent2014-11-2112-54/+171
| | |/
* | | am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent...Chih-hung Hsieh2014-11-252-3/+3
|\ \ \
| * \ \ 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 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 e30dc38b: am 7877cb80: Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 0e4b8c2d: am d56a953a: Merge "Libcpustats: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 5d4eae1a: am e1b737ca: Merge "Remove unused parameter"chh2014-11-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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