summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "connect/disconnect is now called from our EGL wrapper"Mathias Agopian2011-08-015-12/+35
|\
| * connect/disconnect is now called from our EGL wrapperMathias Agopian2011-08-015-12/+35
* | Merge "Add operation counts to network statistics."Jeff Sharkey2011-08-0116-246/+594
|\ \
| * | Add operation counts to network statistics.Jeff Sharkey2011-07-2916-246/+594
* | | Merge "Use high precision iterators on specific GPUs Bug #5098359"Romain Guy2011-08-013-18/+41
|\ \ \
| * | | Use high precision iterators on specific GPUsRomain Guy2011-08-013-18/+41
* | | | Merge "Add functional test for screenshots."Brett Chabot2011-08-016-1/+266
|\ \ \ \
| * | | | Add functional test for screenshots.Brett Chabot2011-07-286-1/+266
* | | | | am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefri...Jean-Baptiste Queru2011-08-010-0/+0
|\ \ \ \ \
| * \ \ \ \ am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return e...Jean-Baptiste Queru2011-08-010-0/+0
| |\ \ \ \ \
| | * \ \ \ \ am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too...Jean-Baptiste Queru2011-08-011-2/+12
| | |\ \ \ \ \
| | | * \ \ \ \ am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to retu...Jean-Baptiste Queru2011-08-011-2/+12
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge "Stagefright: Return error if codec takes too long to return a buffer."Jean-Baptiste Queru2011-08-011-2/+12
| | | | |\ \ \ \ \
| | | | | * | | | | Stagefright: Return error if codec takes too long to return a buffer.Anu Sundararajan2011-04-141-2/+12
* | | | | | | | | | Merge "Revert "Unhide APIs for user space VPN.""Chia-chi Yeh2011-08-013-22/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Unhide APIs for user space VPN."Chia-chi Yeh2011-08-013-22/+3
* | | | | | | | | | | Merge "Plug memory leak in EditText."Romain Guy2011-08-013-23/+35
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Plug memory leak in EditText.Romain Guy2011-08-013-23/+35
* | | | | | | | | | | Merge "SurfaceFlinger: use async mode for video & cam"Jamie Gennis2011-08-013-1/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SurfaceFlinger: use async mode for video & camJamie Gennis2011-07-303-1/+29
* | | | | | | | | | | | Merge "Fix exception when a focused item is detached."Bjorn Bringert2011-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix exception when a focused item is detached.Mark Brophy2011-08-011-1/+1
* | | | | | | | | | | | Merge "Fix NALU extraction of unit starts with a 0x00 nalType"Andreas Huber2011-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix NALU extraction of unit starts with a 0x00 nalTypeAndreas Huber2011-08-011-1/+1
* | | | | | | | | | | | | Merge "SurfaceTexture: allow set_buffer_count(2)"Jamie Gennis2011-08-011-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SurfaceTexture: allow set_buffer_count(2)Jamie Gennis2011-07-301-5/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fixing initialization cleanup in activity instrumentation test case"Romain Guy2011-08-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixing initialization cleanup in activity instrumentation test caseRodrigo Damazio Bovendorp2011-08-011-2/+2
* | | | | | | | | | | | | | Merge "Hide permissions that are not available to apps."Dianne Hackborn2011-08-012-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Hide permissions that are not available to apps.Dianne Hackborn2011-08-012-4/+2
* | | | | | | | | | | | | | | Merge "improve GraphicAllocator dump method"Mathias Agopian2011-08-011-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | improve GraphicAllocator dump methodMathias Agopian2011-07-291-5/+17
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943"Jeff Brown2011-08-011-22/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Tweak hover for better accessibility and compatibility.Jeff Brown2011-07-281-22/+26
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "SurfaceFlinger: abandon Layer SurfaceTextures"Jamie Gennis2011-08-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | SurfaceFlinger: abandon Layer SurfaceTexturesJamie Gennis2011-07-301-0/+1
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revi...Eric Fischer2011-08-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | / / / / / / / | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO N...Eric Fischer2011-08-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-08-0141-318/+400
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-08-0141-318/+400
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-06-2941-318/+400
* | | | | | | | | | | | | | | | Merge "Start playing live streaming HLS content from the first segment."Andreas Huber2011-08-011-11/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Start playing live streaming HLS content from the first segment.Andreas Huber2011-08-011-11/+10
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Change setDevicePropertyNative to no block."Matthew Xie2011-08-011-13/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Change setDevicePropertyNative to no block.Matthew Xie2011-07-291-13/+7
* | | | | | | | | | | | | | | | Merge "Sort the suggestions based based on the length of the text they are at...Luca Zanolin2011-08-011-3/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Sort the suggestions based based on the length of the text they are attached ...Luca Zanolin2011-08-011-3/+36
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "MediaScanner: Move genre table management to MediaProvider"Mike Lockwood2011-08-012-53/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | MediaScanner: Move genre table management to MediaProviderMike Lockwood2011-07-312-53/+10
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Update list_ states Bug: 5076695"Justin Ho2011-08-0129-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |