Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ... | Jamie Gennis | 2011-10-19 | 1 | -1/+1 |
|\ | |||||
| * | Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0 | Jamie Gennis | 2011-10-19 | 1 | -1/+1 |
| |\ | |||||
| | * | SurfaceTexture: free buffers when disconnect fails | Jamie Gennis | 2011-10-18 | 1 | -1/+1 |
* | | | am 9a76afff: Merge "Make Recent Apps faster" into ics-mr0 | Michael Jurka | 2011-10-19 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge "Make Recent Apps faster" into ics-mr0 | Michael Jurka | 2011-10-19 | 0 | -0/+0 |
| |\ \ | |||||
* | \ \ | am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0 | Ben Komalo | 2011-10-19 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Fix remote device wipe to not hang." into ics-mr0 | Ben Komalo | 2011-10-19 | 0 | -0/+0 |
| |\ \ \ | |||||
* | \ \ \ | Merge "Refactor FileInserter in MediaScanner and adding unit tests for the ne... | Marco Nelissen | 2011-10-19 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
* \ \ \ \ \ | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-19 | 0 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-18 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
* | | \ \ \ \ \ | am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0 | Dave Burke | 2011-10-18 | 7 | -28/+227 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Add a LayerScreenshot" into ics-mr0 | Dave Burke | 2011-10-18 | 7 | -28/+227 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add a LayerScreenshot | Mathias Agopian | 2011-10-18 | 7 | -28/+227 |
* | | | | | | | | | am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from ... | Dave Burke | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ... | Dave Burke | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
* | | | | | | | | | am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetP... | James Dong | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). A... | James Dong | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | am f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into... | Mathias Agopian | 2011-10-18 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0 | Mathias Agopian | 2011-10-18 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Don't call hwc set() if there is nothing new to do | Mathias Agopian | 2011-10-18 | 1 | -2/+10 |
* | | | | | | | | | | am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0 | Mathias Agopian | 2011-10-18 | 4 | -40/+30 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Make sure set GL state properly" into ics-mr0 | Mathias Agopian | 2011-10-18 | 4 | -40/+30 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Make sure set GL state properly | Mathias Agopian | 2011-10-18 | 4 | -40/+30 |
* | | | | | | | | | | am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0 | Eric Laurent | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Limit AudioFlinger log." into ics-mr0 | Eric Laurent | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | am cd815fc5: Merge "Doc change: Add Android 4.0 Platform Highlights" into ics... | Dirk Dougherty | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0 | Dirk Dougherty | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer" | Romain Guy | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ | am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0 | Scott Main | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge "docs: fix platform highlights" into ics-mr0 | Scott Main | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more clos... | Jim Miller | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge "Fix 5288804: Make music trasports in lockscreen more closely match des... | Jim Miller | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Add mandelbrot to compute perf" | Jason Sams | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4de8cb50: Merge "docs: update homepage for ICS announcement" into ics-mr0 | Scott Main | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge "docs: update homepage for ICS announcement" into ics-mr0 | Scott Main | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | am 8f8e14c1: Merge "docs: change compatibility package to support package and... | Robert Ly | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "docs: change compatibility package to support package and update rel n... | Robert Ly | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | am 93f97f53: Merge "docs: rs link fixes" into ics-mr0 | Robert Ly | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "docs: rs link fixes" into ics-mr0 | Robert Ly | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | am 90889821: Merge "docs: fix misc broken links" into ics-mr0 | Scott Main | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "docs: fix misc broken links" into ics-mr0 | Scott Main | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | / / / / / / | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | am 49dfd814: Merge "Find on page asset update" into ics-mr0 | John Reck | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge "Find on page asset update" into ics-mr0 | John Reck | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | / / / / / / / | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge "Import revised translations." | Eric Fischer | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Fix full backup of shared storage" | Christopher Tate | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a25a9975: Merge "docs: more ics overview changes... reorg a few sections, ... | Scott Main | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge "docs: more ics overview changes... reorg a few sections, revise intro ... | Scott Main | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 35f78f30: Merge "docs: add package summary for spell checker services" int... | Scott Main | 2011-10-18 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge "docs: add package summary for spell checker services" into ics-mr0 | Scott Main | 2011-10-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |