summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ...Jamie Gennis2011-10-191-1/+1
|\
| * Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0Jamie Gennis2011-10-191-1/+1
| |\
| | * SurfaceTexture: free buffers when disconnect failsJamie Gennis2011-10-181-1/+1
* | | am 9a76afff: Merge "Make Recent Apps faster" into ics-mr0Michael Jurka2011-10-190-0/+0
|\ \ \ | |/ /
| * | Merge "Make Recent Apps faster" into ics-mr0Michael Jurka2011-10-190-0/+0
| |\ \
* | \ \ am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0Ben Komalo2011-10-190-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Fix remote device wipe to not hang." into ics-mr0Ben Komalo2011-10-190-0/+0
| |\ \ \
* | \ \ \ Merge "Refactor FileInserter in MediaScanner and adding unit tests for the ne...Marco Nelissen2011-10-190-0/+0
|\ \ \ \ \
* \ \ \ \ \ Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-190-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-190-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-180-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0Dave Burke2011-10-187-28/+227
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add a LayerScreenshot" into ics-mr0Dave Burke2011-10-187-28/+227
| |\ \ \ \ \ \ \
| | * | | | | | | Add a LayerScreenshotMathias Agopian2011-10-187-28/+227
* | | | | | | | | am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from ...Dave Burke2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ...Dave Burke2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
* | | | | | | | | am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetP...James Dong2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). A...James Dong2011-10-180-0/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ am f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into...Mathias Agopian2011-10-181-2/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0Mathias Agopian2011-10-181-2/+10
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Don't call hwc set() if there is nothing new to doMathias Agopian2011-10-181-2/+10
* | | | | | | | | | am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0Mathias Agopian2011-10-184-40/+30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Make sure set GL state properly" into ics-mr0Mathias Agopian2011-10-184-40/+30
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Make sure set GL state properlyMathias Agopian2011-10-184-40/+30
* | | | | | | | | | am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0Eric Laurent2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Limit AudioFlinger log." into ics-mr0Eric Laurent2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am cd815fc5: Merge "Doc change: Add Android 4.0 Platform Highlights" into ics...Dirk Dougherty2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0Dirk Dougherty2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer"Romain Guy2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0Scott Main2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "docs: fix platform highlights" into ics-mr0Scott Main2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more clos...Jim Miller2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Fix 5288804: Make music trasports in lockscreen more closely match des...Jim Miller2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add mandelbrot to compute perf"Jason Sams2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4de8cb50: Merge "docs: update homepage for ICS announcement" into ics-mr0Scott Main2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "docs: update homepage for ICS announcement" into ics-mr0Scott Main2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 8f8e14c1: Merge "docs: change compatibility package to support package and...Robert Ly2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "docs: change compatibility package to support package and update rel n...Robert Ly2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 93f97f53: Merge "docs: rs link fixes" into ics-mr0Robert Ly2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "docs: rs link fixes" into ics-mr0Robert Ly2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am 90889821: Merge "docs: fix misc broken links" into ics-mr0Scott Main2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "docs: fix misc broken links" into ics-mr0Scott Main2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | / / / / / / | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | am 49dfd814: Merge "Find on page asset update" into ics-mr0John Reck2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Find on page asset update" into ics-mr0John Reck2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | / / / / / / / | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix full backup of shared storage"Christopher Tate2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a25a9975: Merge "docs: more ics overview changes... reorg a few sections, ...Scott Main2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "docs: more ics overview changes... reorg a few sections, revise intro ...Scott Main2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35f78f30: Merge "docs: add package summary for spell checker services" int...Scott Main2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "docs: add package summary for spell checker services" into ics-mr0Scott Main2011-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |