summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 02f00de8: am 4b292317: am 15bcc2d8: Merge "audioservice: fix DTMF stream v...Eric Laurent2013-10-041-56/+71
|\
| * Merge "audioservice: fix DTMF stream volume" into klp-devEric Laurent2013-10-041-56/+71
| |\
| | * audioservice: fix DTMF stream volumeEric Laurent2013-10-031-56/+71
* | | am 3a1abeac: am cf51fefd: am c7c7f5b5: Merge "Fix docs" into klp-devAdam Powell2013-10-041-1/+1
|\ \ \ | |/ /
| * | Fix docsAdam Powell2013-10-031-1/+1
* | | am 91aa6021: am 310796de: am d6239b92: Merge "Add a scrubber to keyguard; lay...Adam Powell2013-10-042-5/+67
|\ \ \ | |/ /
| * | Merge "Add a scrubber to keyguard; layout tweaks" into klp-devAdam Powell2013-10-032-5/+67
| |\ \
| | * | Add a scrubber to keyguard; layout tweaksAdam Powell2013-10-032-5/+67
| | |/
* | | am 61e5349d: am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbac...Eino-Ville Talvala2013-10-042-6/+99
|\ \ \ | |/ /
| * | Camera2: Implement idle callbacksEino-Ville Talvala2013-10-032-6/+99
| |/
* | am 4bf36c3e: am 8222f04e: am 0bc0f109: Merge "audioservice: always acquire wa...Eric Laurent2013-10-021-0/+4
|\ \ | |/
| * Merge "audioservice: always acquire wake lock as AudioService" into klp-devEric Laurent2013-10-011-0/+4
| |\
| | * audioservice: always acquire wake lock as AudioServiceEric Laurent2013-10-011-0/+4
* | | am 36c4adf9: am 990615e3: am fcd61bb5: Merge "Fix MediaTimeProvider seek & ti...Lajos Molnar2013-10-021-3/+24
|\ \ \ | |/ /
| * | Merge "Fix MediaTimeProvider seek & time drift recovery issue" into klp-devLajos Molnar2013-10-011-3/+24
| |\ \
| | * | Fix MediaTimeProvider seek & time drift recovery issueLajos Molnar2013-09-301-3/+24
| | |/
* | | am 13715943: am b4c6b241: Merge "Cache RemoteController artwork bitmap size, ...Jean-Michel Trivi2013-10-012-20/+35
|\ \ \ | |/ /
| * | Merge "Cache RemoteController artwork bitmap size, use it in registration" in...Jean-Michel Trivi2013-09-302-20/+35
| |\ \
| | * | Cache RemoteController artwork bitmap size, use it in registrationJean-Michel Trivi2013-09-292-20/+35
* | | | am db0944de: am 60e7f819: Merge "Improve RemoteControlDisplay registration" i...Jean-Michel Trivi2013-10-013-22/+155
|\ \ \ \ | |/ / /
| * | | Merge "Improve RemoteControlDisplay registration" into klp-devJean-Michel Trivi2013-09-303-22/+155
| |\ \ \ | | |_|/ | |/| |
| | * | Improve RemoteControlDisplay registrationJean-Michel Trivi2013-09-293-22/+155
| | |/
* | | am d42e4132: am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong ...David Friedman2013-09-301-1/+1
|\ \ \ | |/ /
| * | am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in ...David Friedman2013-09-271-1/+1
| |\ \
| | * \ am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool fil...David Friedman2013-09-271-1/+1
| | |\ \
| | | * \ am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo...David Friedman2013-09-271-1/+1
| | | |\ \
| | | | * | Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.David Friedman2013-09-271-1/+1
* | | | | | am 974a6e12: Merge "Make SubtitleController thread safe" into klp-devLajos Molnar2013-09-302-10/+88
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make SubtitleController thread safe" into klp-devLajos Molnar2013-09-272-10/+88
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Make SubtitleController thread safeLajos Molnar2013-09-272-10/+88
* | | | | | am 6e14f9bc: am 2c702990: Merge "Fix logic in fallback ringtone handling" int...Marco Nelissen2013-09-261-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix logic in fallback ringtone handling" into klp-devMarco Nelissen2013-09-261-1/+3
| |\ \ \ \ \
| | * | | | | Fix logic in fallback ringtone handlingMarco Nelissen2013-09-261-1/+3
* | | | | | | am b208861e: am aea8ec1a: Merge "Camera2: Fix Camera integration test deadloc...Zhijun He2013-09-261-7/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Camera2: Fix Camera integration test deadlock" into klp-devZhijun He2013-09-261-7/+33
| |\ \ \ \ \ \
| | * | | | | | Camera2: Fix Camera integration test deadlockZhijun He2013-09-251-7/+33
* | | | | | | | am fbf38016: am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCh...Zhijun He2013-09-251-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-devZhijun He2013-09-251-0/+12
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Camera2: Implement CameraManager#getCameraCharacteristicsZhijun He2013-09-251-0/+12
* | | | | | | | am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-devAlan Viverette2013-09-251-0/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix caption rendering" into klp-devAlan Viverette2013-09-251-0/+17
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix caption renderingAlan Viverette2013-09-251-0/+17
| | |/ / / / /
* | | | | | | am 3fa1d013: am d7b5f3da: Merge "Fix hang" into klp-devMarco Nelissen2013-09-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix hangMarco Nelissen2013-09-251-1/+1
| |/ / / / /
* | | | | | am 6dda4984: am 80e8a28c: Merge "Fix artwork not received in RemoteController...Jean-Michel Trivi2013-09-241-3/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix artwork not received in RemoteController metadata update." into kl...Jean-Michel Trivi2013-09-241-3/+10
| |\ \ \ \ \
| | * | | | | Fix artwork not received in RemoteController metadata update.Jean-Michel Trivi2013-09-231-3/+10
| | |/ / / /
* | | | | | am 6ce2967f: am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a ...Lajos Molnar2013-09-241-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-devLajos Molnar2013-09-241-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | WebVttRenderer: allow BOM at beginning of a WebVTT file.Lajos Molnar2013-09-241-0/+3