Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MTP: Fix some problems with GetObjectHandles and GetNumObjects commands | Mike Lockwood | 2011-06-17 | 1 | -6/+2 |
* | Merge "-Fix some typo -Remove one unnecessary memory allocation" | Gloria Wang | 2011-06-16 | 2 | -17/+15 |
|\ | |||||
| * | -Fix some typo | Gloria Wang | 2011-06-15 | 2 | -17/+15 |
* | | Merge "Allow camera to be disabled via Device Policy Manager" | Wu-cheng Li | 2011-06-16 | 1 | -0/+8 |
|\ \ | |||||
| * | | Allow camera to be disabled via Device Policy Manager | Wu-cheng Li | 2011-05-30 | 1 | -0/+8 |
* | | | Reconcile with gingerbread-release | The Android Open Source Project | 2011-06-15 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | merge in gingerbread-release history after reset to gingerbread | The Android Automerger | 2011-06-09 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | merge in gingerbread-release history after reset to gingerbread | The Android Automerger | 2011-06-06 | 0 | -0/+0 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge "Merge chromium to r11.0.672.0: Compile fix" | Kristian Monsen | 2011-06-14 | 2 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Merge chromium to r11.0.672.0: Compile fix | Kristian Monsen | 2011-06-07 | 2 | -4/+4 |
* | | | | | | | Merge "Bug 4608375" | Glenn Kasten | 2011-06-14 | 3 | -4/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug 4608375 | Glenn Kasten | 2011-06-14 | 3 | -4/+3 |
* | | | | | | | | Merge "Enforce the rule that the timestamp from timelapse video source monoti... | James Dong | 2011-06-14 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Enforce the rule that the timestamp from timelapse video source monotically i... | James Dong | 2011-06-13 | 1 | -1/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | To remove log spam in the Forward Lock DRM plugin. | Gloria Wang | 2011-06-14 | 1 | -30/+30 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge "Duplicated fileDesc is not closed when input file is not forward-lock ... | Gloria Wang | 2011-06-14 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Duplicated fileDesc is not closed when input file is not forward-lock content. | Gloria Wang | 2011-06-13 | 1 | -1/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge "audio: update for audio/audio_policy header names/locations" | Dima Zavin | 2011-06-13 | 7 | -7/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | audio: update for audio/audio_policy header names/locations | Dima Zavin | 2011-06-13 | 7 | -7/+7 |
| |/ / / / / / | |||||
* | | | | | | | Merge "Add an option to force to use HW codec in stagefright cmd tool" | James Dong | 2011-06-13 | 1 | -2/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add an option to force to use HW codec in stagefright cmd tool | James Dong | 2011-06-13 | 1 | -2/+19 |
| |/ / / / / / | |||||
* | | | | | | | Merge "Add B frame support for MPEG4Writer" | James Dong | 2011-06-13 | 4 | -9/+149 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add B frame support for MPEG4Writer | James Dong | 2011-06-13 | 4 | -9/+149 |
| |/ / / / / / | |||||
* | | | | | | | unify SurfaceTexture and Surface | Mathias Agopian | 2011-06-13 | 1 | -346/+2 |
|/ / / / / / | |||||
* | | | | | | CameraService: return stide when dequeueing a buffer | Iliyan Malchev | 2011-06-11 | 1 | -2/+4 |
* | | | | | | Merge "Avoid duplicated code calculating the stts sample duration" | James Dong | 2011-06-10 | 1 | -22/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Avoid duplicated code calculating the stts sample duration | James Dong | 2011-06-10 | 1 | -22/+21 |
* | | | | | | | am 15e9d474: am 88748e6d: am d86302df: Quiet the log. | Dianne Hackborn | 2011-06-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | am 88748e6d: am d86302df: Quiet the log. | Dianne Hackborn | 2011-06-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am d86302df: Quiet the log. | Dianne Hackborn | 2011-06-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Quiet the log. | Dianne Hackborn | 2011-06-09 | 1 | -1/+1 |
* | | | | | | | | | am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandw... | James Dong | 2011-06-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 s... | James Dong | 2011-06-09 | 2 | -12/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do n... | James Dong | 2011-06-09 | 2 | -12/+0 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" i... | James Dong | 2011-06-09 | 2 | -12/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Revert "Add avg bandwidth estimate every 2 seconds - do not merge." | James Dong | 2011-05-19 | 2 | -12/+0 |
* | | | | | | | | | | am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/am... | Conley Owens | 2011-06-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line br... | Conley Owens | 2011-06-09 | 185 | -30089/+30089 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ... | Conley Owens | 2011-06-09 | 185 | -30089/+30089 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" | Conley Owens | 2011-06-09 | 185 | -30089/+30089 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix style | Mans Rullgard | 2011-04-23 | 185 | -30089/+30089 |
* | | | | | | | | | | | | | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index... | James Dong | 2011-06-10 | 1 | -9/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_In... | James Dong | 2011-06-08 | 1 | -9/+10 |
* | | | | | | | | | | | | | | Merge "Correctly handle crop rect event in SoftAVC.cpp" | James Dong | 2011-06-10 | 2 | -8/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Correctly handle crop rect event in SoftAVC.cpp | James Dong | 2011-06-09 | 2 | -8/+11 |
* | | | | | | | | | | | | | | | Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populat... | Andreas Huber | 2011-06-10 | 6 | -44/+255 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it. | Andreas Huber | 2011-06-08 | 6 | -44/+255 |
* | | | | | | | | | | | | | | | | am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds | Marco Nelissen | 2011-06-09 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds | Marco Nelissen | 2011-06-09 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | am a02d9bf9: Make sure we don\'t read from invalid fds | Marco Nelissen | 2011-06-09 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |