Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | am 1f9b6745: Merge commit \'56fbb4d7bcb34af71a08cd126891afafdec217f1\' into HEAD | Bill Yi | 2015-02-20 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEAD | Bill Yi | 2015-02-19 | 490 | -5502/+14112 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
* | | \ \ \ \ \ \ \ \ \ | am cf09e292: am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder" | Marco Nelissen | 2015-02-19 | 2 | -3/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder" | Marco Nelissen | 2015-02-19 | 2 | -3/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am d607e5a5: Merge "Fixes for GSM decoder" | Marco Nelissen | 2015-02-19 | 2 | -3/+28 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge "Fixes for GSM decoder" | Marco Nelissen | 2015-02-19 | 2 | -3/+28 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | Fixes for GSM decoder | Marco Nelissen | 2015-02-19 | 2 | -3/+28 | |
* | | | | | | | | | | | | | | Merge "camera: implement flashlight control" | Chien-Yu Chen | 2015-02-19 | 10 | -3/+965 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | camera: implement flashlight control | Chien-Yu Chen | 2015-02-12 | 10 | -3/+965 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge "Pull out FastThreadDumpState" | Glenn Kasten | 2015-02-19 | 8 | -55/+110 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Pull out FastThreadDumpState | Glenn Kasten | 2015-02-17 | 8 | -55/+110 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge "Refactor AudioPolicyManager" | Jean-Michel Trivi | 2015-02-19 | 31 | -2812/+3233 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Refactor AudioPolicyManager | Jean-Michel Trivi | 2015-02-18 | 31 | -2812/+3233 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info" | Marco Nelissen | 2015-02-18 | 4 | -4/+104 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am a963dacc: am 64753517: Merge "Add dumpsys info" | Marco Nelissen | 2015-02-18 | 4 | -4/+104 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | am 64753517: Merge "Add dumpsys info" | Marco Nelissen | 2015-02-18 | 4 | -4/+104 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | Merge "Add dumpsys info" | Marco Nelissen | 2015-02-18 | 4 | -4/+104 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | | Add dumpsys info | Marco Nelissen | 2015-02-18 | 4 | -4/+104 | |
| | | |/ / / / / / / / | ||||||
* | | | | | | | | | | | Merge "Look up user-specific device policy for disabling camera" | Amith Yamasani | 2015-02-18 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Look up user-specific device policy for disabling camera | Amith Yamasani | 2015-02-13 | 1 | -1/+5 | |
* | | | | | | | | | | | | Merge "stagefright: stop reading meta data after MDAT or MOOF" | Chong Zhang | 2015-02-13 | 2 | -17/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | stagefright: stop reading meta data after MDAT or MOOF | Chong Zhang | 2015-02-13 | 2 | -17/+18 | |
* | | | | | | | | | | | | stagefright: add support for limiting framerate in GraphicBufferSource | Ronghua Wu | 2015-02-12 | 11 | -45/+387 | |
* | | | | | | | | | | | | Merge "process all SEI messages for CC extraction" | Chong Zhang | 2015-02-12 | 4 | -28/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | process all SEI messages for CC extraction | Chong Zhang | 2015-02-12 | 4 | -28/+69 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | am 56fbb4d7: (-s ours) am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagef... | Lajos Molnar | 2015-02-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for ... | Lajos Molnar | 2015-02-11 | 1 | -3/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | am faefd08b: Revert "DO NOT MERGE: stagefright: add support for Intel\'s YUV4... | Lajos Molnar | 2015-02-11 | 1 | -3/+1 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in... | Lajos Molnar | 2015-02-11 | 1 | -3/+1 | |
* | | | | | | | | | | | | am 99c678fb: Track change of IInterface::asBinder from instance method to sta... | Brian Carlstrom | 2015-02-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Track change of IInterface::asBinder from instance method to static method | Brian Carlstrom | 2015-02-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | Track change of IInterface::asBinder from instance method to static method | Brian Carlstrom | 2015-02-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | resolved conflicts for merge of 157defdd to master | Lajos Molnar | 2015-02-10 | 5 | -2/+196 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pa... | Lajos Molnar | 2015-02-10 | 5 | -2/+190 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" ... | Lajos Molnar | 2015-02-10 | 5 | -2/+190 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev | Lajos Molnar | 2015-02-10 | 5 | -2/+190 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | nuplayer: acquire wakelock during offload pause timeout | Weiyin Jiang | 2015-02-06 | 5 | -2/+190 | |
* | | | | | | | | | | | | StageFrightRecorder: update setVideoFrameRate sanity check | Zhijun He | 2015-02-09 | 2 | -1/+3 | |
* | | | | | | | | | | | | am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing h... | Lajos Molnar | 2015-02-09 | 290 | -332/+4575 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h26... | Lajos Molnar | 2015-02-07 | 290 | -332/+4575 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl so... | Lajos Molnar | 2015-02-07 | 290 | -332/+4575 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge "stagefright: change licensing headers on h264dec omxdl sources" into l... | Lajos Molnar | 2015-02-07 | 290 | -332/+4575 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | stagefright: change licensing headers on h264dec omxdl sources | Lajos Molnar | 2015-02-06 | 290 | -332/+4575 | |
* | | | | | | | | | | | | am 5421d5b2: am bff77217: am 17e95f40: stagefright: add media_codecs_google_v... | Lajos Molnar | 2015-02-09 | 1 | -0/+108 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xml | Lajos Molnar | 2015-02-07 | 1 | -0/+108 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am 17e95f40: stagefright: add media_codecs_google_video_le.xml | Lajos Molnar | 2015-02-07 | 1 | -0/+108 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | stagefright: add media_codecs_google_video_le.xml | Lajos Molnar | 2015-02-06 | 1 | -0/+108 | |
* | | | | | | | | | | | | am a23eea5d: am 5dc38beb: am 41d3f579: Fix GSM WAV playback | Marco Nelissen | 2015-02-09 | 2 | -4/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am 5dc38beb: am 41d3f579: Fix GSM WAV playback | Marco Nelissen | 2015-02-07 | 2 | -4/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am 41d3f579: Fix GSM WAV playback | Marco Nelissen | 2015-02-06 | 2 | -4/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / |