summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ne...Yin-Chia Yeh2014-11-193-7/+56
|\
| * am 03181012: Merge "Camera2Client: remove recording stream if necessary" into...Yin-Chia Yeh2014-11-193-7/+56
| |\
| | * Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
| | |\
| | | * Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
* | | | am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int...Eric Laurent2014-11-192-41/+52
|\ \ \ \ | |/ / /
| * | | am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-192-41/+52
| |\ \ \ | | |/ /
| | * | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-192-41/+52
| | |\ \
| | | * | AudioSystem: Add mutex for output cacheEric Laurent2014-11-192-41/+52
* | | | | am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat du...Robert Shih2014-11-191-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | am 408dba5f: Merge "HLS: fix live lock after missing the boat during configur...Robert Shih2014-11-191-0/+20
| |\ \ \ \ | | |/ / /
| | * | | Merge "HLS: fix live lock after missing the boat during configuration change"...Robert Shih2014-11-191-0/+20
| | |\ \ \
| | | * | | HLS: fix live lock after missing the boat during configuration changeRobert Shih2014-11-181-0/+20
* | | | | | am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Don't autoloop notificationsMarco Nelissen2014-11-182-0/+20
| | | |/ /
* | | | | am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for...Robert Shih2014-11-198-13/+39
|\ \ \ \ \ | |/ / / /
| * | | | am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for responsivene...Robert Shih2014-11-198-13/+39
| |\ \ \ \ | | |/ / /
| | * | | Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-...Robert Shih2014-11-198-13/+39
| | |\ \ \
| | | * | | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
| | | |/ /
* | | | | am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-192-0/+12
|\ \ \ \ \
| * \ \ \ \ am e4044209: Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
| |\ \ \ \ \
| | * \ \ \ \ Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
| | |\ \ \ \ \
| | | * | | | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
* | | | | | | | am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP...Eric Laurent2014-11-182-4/+17
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP when suspend...Eric Laurent2014-11-182-4/+17
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp...Eric Laurent2014-11-182-4/+17
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-172-4/+17
* | | | | | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
* | | | | | | | | am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
| | |/ / / / / /
* | | | | | | | am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" i...Jeff Tinker2014-11-181-1/+5
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
| | |\ \ \ \ \ \
| | | * | | | | | Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
* | | | | | | | | am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks from mixing dat...Andy Hung2014-11-181-8/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 4d0a5985: Merge "Prevent stopped audio tracks from mixing data" into lmp-m...Andy Hung2014-11-181-8/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-devAndy Hung2014-11-181-8/+9
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
* | | | | | | | | am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion f...Andy Hung2014-11-181-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 88ec9e99: Merge "Fix race condition in signaling completion for decode." i...Andy Hung2014-11-171-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
| | | |/ / / / / /
* | | | | | | | | am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTra...Robert Shih2014-11-186-0/+56
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-...Robert Shih2014-11-176-0/+56
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /