Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "connect/disconnect is now called from our EGL wrapper" | Mathias Agopian | 2011-08-01 | 5 | -12/+35 |
|\ | |||||
| * | connect/disconnect is now called from our EGL wrapper | Mathias Agopian | 2011-08-01 | 5 | -12/+35 |
* | | Merge "Add operation counts to network statistics." | Jeff Sharkey | 2011-08-01 | 16 | -246/+594 |
|\ \ | |||||
| * | | Add operation counts to network statistics. | Jeff Sharkey | 2011-07-29 | 16 | -246/+594 |
* | | | Merge "Use high precision iterators on specific GPUs Bug #5098359" | Romain Guy | 2011-08-01 | 3 | -18/+41 |
|\ \ \ | |||||
| * | | | Use high precision iterators on specific GPUs | Romain Guy | 2011-08-01 | 3 | -18/+41 |
* | | | | Merge "Add functional test for screenshots." | Brett Chabot | 2011-08-01 | 6 | -1/+266 |
|\ \ \ \ | |||||
| * | | | | Add functional test for screenshots. | Brett Chabot | 2011-07-28 | 6 | -1/+266 |
* | | | | | am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefri... | Jean-Baptiste Queru | 2011-08-01 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return e... | Jean-Baptiste Queru | 2011-08-01 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too... | Jean-Baptiste Queru | 2011-08-01 | 1 | -2/+12 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to retu... | Jean-Baptiste Queru | 2011-08-01 | 1 | -2/+12 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge "Stagefright: Return error if codec takes too long to return a buffer." | Jean-Baptiste Queru | 2011-08-01 | 1 | -2/+12 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Stagefright: Return error if codec takes too long to return a buffer. | Anu Sundararajan | 2011-04-14 | 1 | -2/+12 |
* | | | | | | | | | | Merge "Revert "Unhide APIs for user space VPN."" | Chia-chi Yeh | 2011-08-01 | 3 | -22/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Revert "Unhide APIs for user space VPN." | Chia-chi Yeh | 2011-08-01 | 3 | -22/+3 |
* | | | | | | | | | | | Merge "Plug memory leak in EditText." | Romain Guy | 2011-08-01 | 3 | -23/+35 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Plug memory leak in EditText. | Romain Guy | 2011-08-01 | 3 | -23/+35 |
* | | | | | | | | | | | Merge "SurfaceFlinger: use async mode for video & cam" | Jamie Gennis | 2011-08-01 | 3 | -1/+29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | SurfaceFlinger: use async mode for video & cam | Jamie Gennis | 2011-07-30 | 3 | -1/+29 |
* | | | | | | | | | | | | Merge "Fix exception when a focused item is detached." | Bjorn Bringert | 2011-08-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix exception when a focused item is detached. | Mark Brophy | 2011-08-01 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge "Fix NALU extraction of unit starts with a 0x00 nalType" | Andreas Huber | 2011-08-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix NALU extraction of unit starts with a 0x00 nalType | Andreas Huber | 2011-08-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge "SurfaceTexture: allow set_buffer_count(2)" | Jamie Gennis | 2011-08-01 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | SurfaceTexture: allow set_buffer_count(2) | Jamie Gennis | 2011-07-30 | 1 | -5/+5 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge "Fixing initialization cleanup in activity instrumentation test case" | Romain Guy | 2011-08-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fixing initialization cleanup in activity instrumentation test case | Rodrigo Damazio Bovendorp | 2011-08-01 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge "Hide permissions that are not available to apps." | Dianne Hackborn | 2011-08-01 | 2 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Hide permissions that are not available to apps. | Dianne Hackborn | 2011-08-01 | 2 | -4/+2 |
* | | | | | | | | | | | | | | | Merge "improve GraphicAllocator dump method" | Mathias Agopian | 2011-08-01 | 1 | -5/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | improve GraphicAllocator dump method | Mathias Agopian | 2011-07-29 | 1 | -5/+17 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943" | Jeff Brown | 2011-08-01 | 1 | -22/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Tweak hover for better accessibility and compatibility. | Jeff Brown | 2011-07-28 | 1 | -22/+26 |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge "SurfaceFlinger: abandon Layer SurfaceTextures" | Jamie Gennis | 2011-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | SurfaceFlinger: abandon Layer SurfaceTextures | Jamie Gennis | 2011-07-30 | 1 | -0/+1 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revi... | Eric Fischer | 2011-08-01 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | / / / / / / / | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO N... | Eric Fischer | 2011-08-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread | Eric Fischer | 2011-08-01 | 41 | -318/+400 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge "Import revised translations. DO NOT MERGE" into gingerbread | Eric Fischer | 2011-08-01 | 41 | -318/+400 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-06-29 | 41 | -318/+400 |
* | | | | | | | | | | | | | | | | Merge "Start playing live streaming HLS content from the first segment." | Andreas Huber | 2011-08-01 | 1 | -11/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Start playing live streaming HLS content from the first segment. | Andreas Huber | 2011-08-01 | 1 | -11/+10 |
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge "Change setDevicePropertyNative to no block." | Matthew Xie | 2011-08-01 | 1 | -13/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Change setDevicePropertyNative to no block. | Matthew Xie | 2011-07-29 | 1 | -13/+7 |
* | | | | | | | | | | | | | | | | Merge "Sort the suggestions based based on the length of the text they are at... | Luca Zanolin | 2011-08-01 | 1 | -3/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Sort the suggestions based based on the length of the text they are attached ... | Luca Zanolin | 2011-08-01 | 1 | -3/+36 |
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge "MediaScanner: Move genre table management to MediaProvider" | Mike Lockwood | 2011-08-01 | 2 | -53/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | MediaScanner: Move genre table management to MediaProvider | Mike Lockwood | 2011-07-31 | 2 | -53/+10 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge "Update list_ states Bug: 5076695" | Justin Ho | 2011-08-01 | 29 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |