summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSo...Lajos Molnar2014-12-111-1/+1
|\ \ \ \ | |/ / /
| * | | am f484952e: mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-111-1/+1
| |\ \ \ | | |/ /
| | * | mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
* | | | am 4e3c2bbc: am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updat...Bernhard Rosenkränzer2014-12-100-0/+0
|\ \ \ \ | |/ / /
| * | | am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-102-3/+3
| |\ \ \ | | |/ /
| | * | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
* | | | Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesour...rmcloughlin2014-12-100-0/+0
|\ \ \ \
| * \ \ \ am ab01c22a: am cf1e3bb2: Merge "Fix AAC recording issue"Marco Nelissen2014-12-100-0/+0
| |\ \ \ \
| | * \ \ \ am cf1e3bb2: Merge "Fix AAC recording issue"Marco Nelissen2014-12-101-1/+2
| | |\ \ \ \
| | | * \ \ \ Merge "Fix AAC recording issue"Marco Nelissen2014-12-101-1/+2
| | | |\ \ \ \
| | | | * | | | Fix AAC recording issueMarco Nelissen2014-12-101-1/+2
| | | |/ / / /
* | | | | | | am 1546028a: am 1767df77: AudioPolicyManager: distinguish between mirroring a...Jean-Michel Trivi2014-12-102-2/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | am 1767df77: AudioPolicyManager: distinguish between mirroring and reroutingJean-Michel Trivi2014-12-102-2/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | AudioPolicyManager: distinguish between mirroring and reroutingJean-Michel Trivi2014-12-092-2/+8
* | | | | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-108-2/+95
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1487d270: Merge "audio policy: binder calls for dynamic audio policy mixes...Eric Laurent2014-12-108-2/+95
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr...Eric Laurent2014-12-108-2/+95
| | |\ \ \ \
| | | * | | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-098-2/+95
* | | | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-108-106/+648
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2dda40d6: Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-108-106/+648
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-108-106/+648
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | audio policy: add support for custom mixesEric Laurent2014-12-098-106/+648
* | | | | | | am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| | |\ \ \ \ \
| | | * | | | | Truncate file before recording into it.Marco Nelissen2014-12-101-0/+3
* | | | | | | | am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
| | |\ \ \ \ \ \
| | | * | | | | | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
| | |/ / / / / /
* | | | | | | | am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after result"...Chien-Yu Chen2014-12-102-141/+234
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 9cea7aa4: Merge "Camera3Device: support shutter after result" into lmp-mr1...Chien-Yu Chen2014-12-092-141/+234
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "Camera3Device: support shutter after result" into lmp-mr1-devChien-Yu Chen2014-12-092-141/+234
| | |\ \ \ \ \ \
| | | * | | | | | Camera3Device: support shutter after resultChien-Yu Chen2014-12-092-141/+234
* | | | | | | | | Merge commit '2340e5a8' into manualmergeRuben Brunk2014-12-092-4/+81
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 6533dc1c: Merge "Camera2: Round unsupported surface sizes in configure." i...Ruben Brunk2014-12-092-4/+81
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-devRuben Brunk2014-12-092-4/+81
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Camera2: Round unsupported surface sizes in configure.Ruben Brunk2014-12-052-4/+81
* | | | | | | | | am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Fix AAC recording issueMarco Nelissen2014-12-091-1/+2
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| | |\ \ \ \ \ \
| | | * | | | | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2737-98/+98