Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Convert the outer lockscreen ring to a shape drawable." | Peter Ng | 2011-10-25 | 0 | -0/+0 |
|\ | |||||
* \ | Merge "Text handles do not handle scroll correctly" | Gilles Debunne | 2011-10-25 | 0 | -0/+0 |
|\ \ | |||||
* \ \ | Merge "Import revised translations." | Eric Fischer | 2011-10-25 | 0 | -0/+0 |
|\ \ \ | |_|/ |/| | | |||||
* | | | Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE | Steve Block | 2011-10-25 | 5 | -14/+14 |
* | | | am 763480fb: Merge "Fixed a bug that causes AccountManager calls to hang fore... | Fred Quintana | 2011-10-24 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge "Fixed a bug that causes AccountManager calls to hang forever, eventual... | Fred Quintana | 2011-10-24 | 0 | -0/+0 |
| |\ \ \ | |||||
* | \ \ \ | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-24 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-24 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | Merge "tablet unlock ring and wave updated for ics" | Peter Ng | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | am 5657b739: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0 | Eric Fischer | 2011-10-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
* | | | | | | | am 057e85ac: Merge "docs: remove links to ADP devices" into ics-mr0 | Scott Main | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "docs: remove links to ADP devices" into ics-mr0 | Scott Main | 2011-10-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge "String scrub to implement punc, wording, cap standards. Bugs: 5165745,... | Claudia de Veaux | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ | Merge "Use libcorkscrew for stack unwinding." | Jeff Brown | 2011-10-24 | 3 | -272/+63 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use libcorkscrew for stack unwinding. | Jeff Brown | 2011-10-22 | 3 | -272/+63 |
| |/ / / / / / / | |||||
* | | | | | | | | am 7a962fef: Merge "Fix 3384942: Force ASCII-capable IME to show on lockscree... | Jim Miller | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0 | Jim Miller | 2011-10-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge. | Xavier Ducrohet | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | CherryPick f9e455 from master to mr0. do not merge. | Xavier Ducrohet | 2011-10-24 | 1 | -1/+1 |
* | | | | | | | | | am c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" i... | Brian Colonna | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0 | Brian Colonna | 2011-10-24 | 0 | -0/+0 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge. | Xavier Ducrohet | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
* | | | | | | | | Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys." | Xavier Ducrohet | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | am 084369fb: docs: add uiOptions attribute to manifest docs | Scott Main | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | am cd3ec73f: Add getAvailableNetworks. | Wink Saville | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
* | | | | | | | | Merge "Adding APIs to enable reporting virtual view hierarchies to accessibil... | Svetoslav Ganov | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge "Stat notify image update" | Peter Ng | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | mDirtyRegion is single threaded, but could be accessed from a hwc thread | Mathias Agopian | 2011-10-21 | 2 | -2/+23 |
| | * | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ | |||||
* | | | \ \ \ \ \ | Merge "Add support for SMS-PP data download to USIM." | Jake Hamby | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ | am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection in... | Peter Ng | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge "Do not merge - Recents background protection increased" into ics-mr0 | Peter Ng | 2011-10-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge "Fix rebuildWebTextView issues" | John Reck | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ | Merge "Fix software GL renderer." | Xavier Ducrohet | 2011-10-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix software GL renderer. | Xavier Ducrohet | 2011-10-21 | 1 | -1/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed fr... | Mathias Agopian | 2011-10-21 | 2 | -2/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thre... | Mathias Agopian | 2011-10-21 | 2 | -2/+23 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | mDirtyRegion is single threaded, but could be accessed from a hwc thread | Mathias Agopian | 2011-10-21 | 2 | -2/+23 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0 | Eric Fischer | 2011-10-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge "Recents background protection increased" | Daniel Shiplacoff | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | am 8bf89f30: (-s ours) Fix the build | John Reck | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | am e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS im... | Adam Cohen | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Removing fades on last item in StackView for major FPS improvement on ... | Adam Cohen | 2011-10-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0 | John Reck | 2011-10-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |