| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks" | Elliott Hughes | 2014-12-12 | 1 | -24/+11 |
| |\ | |||||
| | * | am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks" | Elliott Hughes | 2014-12-12 | 1 | -24/+11 |
| | |\ | |||||
| | | * | Merge "Remove obsolete TARGET_SIMULATOR checks" | Elliott Hughes | 2014-12-12 | 1 | -24/+11 |
| | | |\ | |||||
| | | | * | Remove obsolete TARGET_SIMULATOR checks | Trevor Drake | 2014-12-11 | 1 | -24/+11 |
| * | | | | am 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for dynamic source" i... | Eric Laurent | 2014-12-12 | 2 | -48/+101 |
| |\ \ \ \ | |||||
| | * \ \ \ | am 8cffa91a: Merge "audio policy: suppport for dynamic source" into lmp-mr1-dev | Eric Laurent | 2014-12-11 | 2 | -48/+101 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge "audio policy: suppport for dynamic source" into lmp-mr1-dev | Eric Laurent | 2014-12-11 | 2 | -48/+101 |
| | | |\ \ \ \ | |||||
| | | | * | | | | audio policy: suppport for dynamic source | Eric Laurent | 2014-12-10 | 2 | -48/+101 |
| * | | | | | | | am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instan... | Chih-Hung Hsieh | 2014-12-12 | 1 | -6/+3 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | am f1b12df3: Merge "Trigger error only when a template is instantiated." | Chih-Hung Hsieh | 2014-12-12 | 1 | -6/+3 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | | Merge "Trigger error only when a template is instantiated." | Chih-Hung Hsieh | 2014-12-12 | 1 | -6/+3 |
| | | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | | * | | | | Trigger error only when a template is instantiated. | Chih-Hung Hsieh | 2014-12-11 | 1 | -6/+3 |
| * | | | | | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp | Lajos Molnar | 2014-12-11 | 19 | -997/+601 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | am a0940a56: stagefright: misc fixes to software video encoders (and decoders) | Lajos Molnar | 2014-12-11 | 19 | -997/+600 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | | stagefright: misc fixes to software video encoders (and decoders) | Lajos Molnar | 2014-12-10 | 19 | -997/+600 |
| * | | | | | | | am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames whe... | Phil Burk | 2014-12-11 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 94a92c69: Merge "[audio][audioflinger] Consume all frames when a DirectThr... | Phil Burk | 2014-12-11 | 1 | -2/+7 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge "[audio][audioflinger] Consume all frames when a DirectThread is done."... | Phil Burk | 2014-12-11 | 1 | -2/+7 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | [audio][audioflinger] Consume all frames when a DirectThread is done. | Phil Burk | 2014-12-10 | 1 | -2/+7 |
| * | | | | | | | | am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSo... | Lajos Molnar | 2014-12-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am f484952e: mediaplayer: allow setVideoSurface before setDataSource | Lajos Molnar | 2014-12-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | mediaplayer: allow setVideoSurface before setDataSource | Lajos Molnar | 2014-12-10 | 1 | -1/+1 |
| | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | | am 4e3c2bbc: am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updat... | Bernhard Rosenkränzer | 2014-12-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions | Bernhard Rosenkränzer | 2014-12-10 | 2 | -3/+3 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions | Bernhard Rosenkränzer | 2014-12-09 | 2 | -3/+3 |
| * | | | | | | | Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesour... | rmcloughlin | 2014-12-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am ab01c22a: am cf1e3bb2: Merge "Fix AAC recording issue" | Marco Nelissen | 2014-12-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | | am cf1e3bb2: Merge "Fix AAC recording issue" | Marco Nelissen | 2014-12-10 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | | * | | | | | Merge "Fix AAC recording issue" | Marco Nelissen | 2014-12-10 | 1 | -1/+2 |
| | | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | | | * | | | | Fix AAC recording issue | Marco Nelissen | 2014-12-10 | 1 | -1/+2 |
| | | | |/ / / / | |||||
| * | | | | | | | am 1546028a: am 1767df77: AudioPolicyManager: distinguish between mirroring a... | Jean-Michel Trivi | 2014-12-10 | 2 | -2/+8 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| | * | | | | | am 1767df77: AudioPolicyManager: distinguish between mirroring and rerouting | Jean-Michel Trivi | 2014-12-10 | 2 | -2/+8 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | | AudioPolicyManager: distinguish between mirroring and rerouting | Jean-Michel Trivi | 2014-12-09 | 2 | -2/+8 |
| * | | | | | | Merge commit 'f5a968a0' into mm | Glenn Kasten | 2014-12-10 | 8 | -2/+95 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | am 1487d270: Merge "audio policy: binder calls for dynamic audio policy mixes... | Eric Laurent | 2014-12-10 | 8 | -2/+95 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr... | Eric Laurent | 2014-12-10 | 8 | -2/+95 |
| | | |\ \ \ \ | |||||
| | | | * | | | | audio policy: binder calls for dynamic audio policy mixes | Eric Laurent | 2014-12-09 | 8 | -2/+95 |
| * | | | | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ... | Eric Laurent | 2014-12-10 | 8 | -106/+648 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 2dda40d6: Merge "audio policy: add support for custom mixes" into lmp-mr1-dev | Eric Laurent | 2014-12-10 | 8 | -106/+648 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge "audio policy: add support for custom mixes" into lmp-mr1-dev | Eric Laurent | 2014-12-10 | 8 | -106/+648 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | audio policy: add support for custom mixes | Eric Laurent | 2014-12-09 | 8 | -106/+648 |
| * | | | | | | | am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it." | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | am a04c05ab: Merge "Truncate file before recording into it." | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | | Merge "Truncate file before recording into it." | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Truncate file before recording into it. | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
| * | | | | | | | | am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches." | Chih-Hung Hsieh | 2014-12-10 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 1914e7ed: Merge "Fix print format mismatches." | Chih-Hung Hsieh | 2014-12-10 | 2 | -3/+3 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Merge "Fix print format mismatches." | Chih-Hung Hsieh | 2014-12-10 | 2 | -3/+3 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Fix print format mismatches. | Chih-Hung Hsieh | 2014-12-09 | 2 | -3/+3 |
| | | |/ / / / / / | |||||
| * | | | | | | | | am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after result"... | Chien-Yu Chen | 2014-12-10 | 2 | -141/+234 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
 |
index : frameworks_av.git | |
| frameworks/av | git repository hosting |
| summaryrefslogtreecommitdiffstats |