Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | am 9cea7aa4: Merge "Camera3Device: support shutter after result" into lmp-mr1... | Chien-Yu Chen | 2014-12-09 | 2 | -141/+234 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge "Camera3Device: support shutter after result" into lmp-mr1-dev | Chien-Yu Chen | 2014-12-09 | 2 | -141/+234 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Camera3Device: support shutter after result | Chien-Yu Chen | 2014-12-09 | 2 | -141/+234 |
* | | | | | | | | Merge commit '2340e5a8' into manualmerge | Ruben Brunk | 2014-12-09 | 2 | -4/+81 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 6533dc1c: Merge "Camera2: Round unsupported surface sizes in configure." i... | Ruben Brunk | 2014-12-09 | 2 | -4/+81 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-dev | Ruben Brunk | 2014-12-09 | 2 | -4/+81 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | Camera2: Round unsupported surface sizes in configure. | Ruben Brunk | 2014-12-05 | 2 | -4/+81 |
* | | | | | | | | am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev | Marco Nelissen | 2014-12-09 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev | Marco Nelissen | 2014-12-09 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Fix AAC recording issue" into lmp-mr1-dev | Marco Nelissen | 2014-12-09 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | Fix AAC recording issue | Marco Nelissen | 2014-12-09 | 1 | -1/+2 |
* | | | | | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 37 | -98/+98 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | am d1aeff55: Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 37 | -98/+98 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 37 | -98/+98 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix build with clang in C++11 mode | Bernhard Rosenkränzer | 2014-11-27 | 37 | -98/+98 |
* | | | | | | | | | am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print." | Lajos Molnar | 2014-12-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 66172f5c: Merge "Cast int64_t values to long long before print." | Lajos Molnar | 2014-12-09 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Cast int64_t values to long long before print." | Lajos Molnar | 2014-12-09 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Cast int64_t values to long long before print. | Bernhard Rosenkränzer | 2014-12-04 | 1 | -2/+2 |
* | | | | | | | | | | am 5abc1201: am 3cc93734: Merge "Fix build with clang" | Lajos Molnar | 2014-12-09 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 3cc93734: Merge "Fix build with clang" | Lajos Molnar | 2014-12-09 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "Fix build with clang" | Lajos Molnar | 2014-12-09 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Fix build with clang | Bernhard Rosenkränzer | 2014-12-08 | 1 | -2/+1 |
| | | |/ / / / / / / | |||||
* | | | | | | | | | | am 54a6b2e1: am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-... | Glenn Kasten | 2014-12-09 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed" | Glenn Kasten | 2014-12-09 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "Prevent ANR when AudioTrack is paused or re-routed" | Glenn Kasten | 2014-12-09 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Prevent ANR when AudioTrack is paused or re-routed | zunkyu.lee | 2014-12-08 | 1 | -0/+2 |
| | | | |/ / / / / / | | | |/| | | | | | | |||||
* | | | | | | | | | | am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables" | Andreas Gampe | 2014-12-09 | 2 | -4/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am f3df58c7: Merge "Stagefright: Fix unused variables" | Andreas Gampe | 2014-12-08 | 2 | -4/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "Stagefright: Fix unused variables" | Andreas Gampe | 2014-12-08 | 2 | -4/+1 |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Stagefright: Fix unused variables | Andreas Gampe | 2014-12-04 | 2 | -4/+1 |
| | |/ / / / / / / | |||||
* | | | | | | | | | am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed | zunkyu.lee | 2014-12-09 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed | zunkyu.lee | 2014-12-09 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Prevent ANR when AudioTrack is paused or re-routed | zunkyu.lee | 2014-12-08 | 1 | -0/+2 |
* | | | | | | | | | am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRM | Lajos Molnar | 2014-12-08 | 1 | -3/+32 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am ca7b4bc4: mediaplayerservice: add support for legacy DRM | Lajos Molnar | 2014-12-06 | 1 | -3/+32 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | mediaplayerservice: add support for legacy DRM | Lajos Molnar | 2014-12-05 | 1 | -3/+32 |