summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | am 1f9b6745: Merge commit \'56fbb4d7bcb34af71a08cd126891afafdec217f1\' into HEADBill Yi2015-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-19490-5502/+14112
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ am cf09e292: am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fixes for GSM decoderMarco Nelissen2015-02-192-3/+28
* | | | | | | | | | | | | | Merge "camera: implement flashlight control"Chien-Yu Chen2015-02-1910-3/+965
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | camera: implement flashlight controlChien-Yu Chen2015-02-1210-3/+965
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Pull out FastThreadDumpState"Glenn Kasten2015-02-198-55/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Pull out FastThreadDumpStateGlenn Kasten2015-02-178-55/+110
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Refactor AudioPolicyManager"Jean-Michel Trivi2015-02-1931-2812/+3233
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactor AudioPolicyManagerJean-Michel Trivi2015-02-1831-2812/+3233
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Add dumpsys infoMarco Nelissen2015-02-184-4/+104
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "Look up user-specific device policy for disabling camera"Amith Yamasani2015-02-181-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Look up user-specific device policy for disabling cameraAmith Yamasani2015-02-131-1/+5
* | | | | | | | | | | | Merge "stagefright: stop reading meta data after MDAT or MOOF"Chong Zhang2015-02-132-17/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | stagefright: stop reading meta data after MDAT or MOOFChong Zhang2015-02-132-17/+18
* | | | | | | | | | | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-1211-45/+387
* | | | | | | | | | | | Merge "process all SEI messages for CC extraction"Chong Zhang2015-02-124-28/+69
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | process all SEI messages for CC extractionChong Zhang2015-02-124-28/+69
| |/ / / / / / / / / /
* | | | | | | | | | | am 56fbb4d7: (-s ours) am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagef...Lajos Molnar2015-02-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for ...Lajos Molnar2015-02-111-3/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am faefd08b: Revert "DO NOT MERGE: stagefright: add support for Intel\'s YUV4...Lajos Molnar2015-02-111-3/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in...Lajos Molnar2015-02-111-3/+1
* | | | | | | | | | | | am 99c678fb: Track change of IInterface::asBinder from instance method to sta...Brian Carlstrom2015-02-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-091-1/+1
* | | | | | | | | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-101-1/+1
* | | | | | | | | | | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-105-2/+196
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pa...Lajos Molnar2015-02-105-2/+190
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" ...Lajos Molnar2015-02-105-2/+190
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-devLajos Molnar2015-02-105-2/+190
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-065-2/+190
* | | | | | | | | | | | StageFrightRecorder: update setVideoFrameRate sanity checkZhijun He2015-02-092-1/+3
* | | | | | | | | | | | am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing h...Lajos Molnar2015-02-09290-332/+4575
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h26...Lajos Molnar2015-02-07290-332/+4575
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl so...Lajos Molnar2015-02-07290-332/+4575
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "stagefright: change licensing headers on h264dec omxdl sources" into l...Lajos Molnar2015-02-07290-332/+4575
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | stagefright: change licensing headers on h264dec omxdl sourcesLajos Molnar2015-02-06290-332/+4575
* | | | | | | | | | | | am 5421d5b2: am bff77217: am 17e95f40: stagefright: add media_codecs_google_v...Lajos Molnar2015-02-091-0/+108
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-071-0/+108
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-071-0/+108
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-061-0/+108
* | | | | | | | | | | | am a23eea5d: am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-092-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-072-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /