summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Convert the outer lockscreen ring to a shape drawable."Peter Ng2011-10-250-0/+0
|\
* \ Merge "Text handles do not handle scroll correctly"Gilles Debunne2011-10-250-0/+0
|\ \
* \ \ Merge "Import revised translations."Eric Fischer2011-10-250-0/+0
|\ \ \ | |_|/ |/| |
* | | Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGESteve Block2011-10-255-14/+14
* | | am 763480fb: Merge "Fixed a bug that causes AccountManager calls to hang fore...Fred Quintana2011-10-240-0/+0
|\ \ \
| * \ \ Merge "Fixed a bug that causes AccountManager calls to hang forever, eventual...Fred Quintana2011-10-240-0/+0
| |\ \ \
* | \ \ \ Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \
| * \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "tablet unlock ring and wave updated for ics"Peter Ng2011-10-240-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | am 5657b739: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-10-240-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-240-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | am 057e85ac: Merge "docs: remove links to ADP devices" into ics-mr0Scott Main2011-10-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "docs: remove links to ADP devices" into ics-mr0Scott Main2011-10-240-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "String scrub to implement punc, wording, cap standards. Bugs: 5165745,...Claudia de Veaux2011-10-240-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Use libcorkscrew for stack unwinding."Jeff Brown2011-10-243-272/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | Use libcorkscrew for stack unwinding.Jeff Brown2011-10-223-272/+63
| |/ / / / / / /
* | | | | | | | am 7a962fef: Merge "Fix 3384942: Force ASCII-capable IME to show on lockscree...Jim Miller2011-10-240-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0Jim Miller2011-10-240-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.Xavier Ducrohet2011-10-240-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | CherryPick f9e455 from master to mr0. do not merge.Xavier Ducrohet2011-10-241-1/+1
* | | | | | | | | am c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" i...Brian Colonna2011-10-240-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0Brian Colonna2011-10-240-0/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.Xavier Ducrohet2011-10-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
* | | | | | | | Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys."Xavier Ducrohet2011-10-240-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | am 084369fb: docs: add uiOptions attribute to manifest docsScott Main2011-10-240-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | am cd3ec73f: Add getAvailableNetworks.Wink Saville2011-10-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
* | | | | | | | Merge "Adding APIs to enable reporting virtual view hierarchies to accessibil...Svetoslav Ganov2011-10-240-0/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge "Stat notify image update"Peter Ng2011-10-240-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | mDirtyRegion is single threaded, but could be accessed from a hwc threadMathias Agopian2011-10-212-2/+23
| | * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| | | |\ \ \ \ \
* | | | \ \ \ \ \ Merge "Add support for SMS-PP data download to USIM."Jake Hamby2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection in...Peter Ng2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Do not merge - Recents background protection increased" into ics-mr0Peter Ng2011-10-210-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge "Fix rebuildWebTextView issues"John Reck2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Fix software GL renderer."Xavier Ducrohet2011-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix software GL renderer.Xavier Ducrohet2011-10-211-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed fr...Mathias Agopian2011-10-212-2/+23
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thre...Mathias Agopian2011-10-212-2/+23
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | mDirtyRegion is single threaded, but could be accessed from a hwc threadMathias Agopian2011-10-212-2/+23
| | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Recents background protection increased"Daniel Shiplacoff2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | am 8bf89f30: (-s ours) Fix the buildJohn Reck2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | am e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS im...Adam Cohen2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Removing fades on last item in StackView for major FPS improvement on ...Adam Cohen2011-10-210-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0John Reck2011-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /