summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level compensation" ...Ricardo Garcia2014-12-162-104/+144
|\
| * am 8975220e: Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
| |\
| | * Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
| | |\
| | | * Fix for Bundled Effects level compensationRicardo Garcia2014-12-092-104/+144
* | | | am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests in stopPreview...Chien-Yu Chen2014-12-161-0/+9
|\ \ \ \ | |/ / /
| * | | am 6eac9e2f: Merge "Camera2Client: flush requests in stopPreviewL" into lmp-m...Chien-Yu Chen2014-12-161-0/+9
| |\ \ \ | | |/ /
| | * | Merge "Camera2Client: flush requests in stopPreviewL" into lmp-mr1-devChien-Yu Chen2014-12-151-0/+9
| | |\ \
| | | * | Camera2Client: flush requests in stopPreviewLRuchit Sharma2014-12-151-0/+9
* | | | | am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// ...Jeff Tinker2014-12-151-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | am 9f932418: Merge "Fix for apps that forget to use widevine:// urls" into lm...Jeff Tinker2014-12-151-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-devJeff Tinker2014-12-151-0/+8
| | |\ \ \
| | | * | | Fix for apps that forget to use widevine:// urlsJeff Tinker2014-12-151-0/+8
* | | | | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lm...Lajos Molnar2014-12-152-1/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2aa82e78: Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-152-1/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-152-1/+18
| | |\ \ \ \
| | | * | | | MediaCodecList: handle binder deathLajos Molnar2014-12-122-1/+18
| | | | |/ / | | | |/| |
* | | | | | am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to cl...Wei Jia2014-12-152-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to client when the...Wei Jia2014-12-152-2/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is no...Wei Jia2014-12-152-2/+6
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | NuPlayer: send NOT_SEEKABLE media info to client when the source is not seeka...Wei Jia2014-12-122-2/+6
* | | | | | am aff13ad4: am 8ddb0223: Merge "Tunneled video Playback/Max resolution: Call...Rachad2014-12-131-1/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8ddb0223: Merge "Tunneled video Playback/Max resolution: Call mOmx->prepar...Rachad2014-12-131-1/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptiveP...Rachad2014-12-131-1/+15
| | |\ \ \ \
| | | * | | | Tunneled video Playback/Max resolution:Rachad2014-12-121-1/+15
* | | | | | | am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder supp...Lajos Molnar2014-12-131-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder support" into lmp...Lajos Molnar2014-12-131-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "stagefright: advertise 8kHz AAC decoder support" into lmp-mr1-devLajos Molnar2014-12-131-1/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | stagefright: advertise 8kHz AAC decoder supportLajos Molnar2014-12-131-1/+2
* | | | | | | am 23085662: am c73ca6ef: audio policy: fix remote mic captureEric Laurent2014-12-132-17/+43
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c73ca6ef: audio policy: fix remote mic captureEric Laurent2014-12-132-17/+43
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | audio policy: fix remote mic captureEric Laurent2014-12-122-17/+43
| | | |_|/ / | | |/| | |
* | | | | | am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
|\ \ \ \ \ \
| * \ \ \ \ \ 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 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for dynamic source" i...Eric Laurent2014-12-122-48/+101
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am 8cffa91a: Merge "audio policy: suppport for dynamic source" into lmp-mr1-devEric Laurent2014-12-112-48/+101
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge "audio policy: suppport for dynamic source" into lmp-mr1-devEric Laurent2014-12-112-48/+101
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | audio policy: suppport for dynamic sourceEric Laurent2014-12-102-48/+101
* | | | | | | | | am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instan...Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | 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
* | | | | | | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1119-997/+601
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am a0940a56: stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1119-997/+600
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1019-997/+600
* | | | | | | | | am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames whe...Phil Burk2014-12-111-2/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 94a92c69: Merge "[audio][audioflinger] Consume all frames when a DirectThr...Phil Burk2014-12-111-2/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "[audio][audioflinger] Consume all frames when a DirectThread is done."...Phil Burk2014-12-111-2/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | [audio][audioflinger] Consume all frames when a DirectThread is done.Phil Burk2014-12-101-2/+7
| | | | |_|_|_|_|/ | | | |/| | | | |