Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SurfaceFlinger: make sync transactions explicit | Jamie Gennis | 2011-10-14 | 6 | -31/+53 |
* | Merge "Make launchtestxlw use constant." | Stephen Hines | 2011-10-14 | 0 | -0/+0 |
|\ | |||||
* \ | am e95aaf06: Merge "Update indicator_code lock assets" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge "Update indicator_code lock assets" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
| |\ \ | |||||
* | \ \ | am 8b319150: Merge "Update text select handles" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Update text select handles" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
* | | | | am 048e5c80: Merge "Update spinners" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Update spinners" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
* | | | | am 4a6f76da: Merge "Updated scrubber_control assets" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Updated scrubber_control assets" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
* | | | | am 64ba25de: Merge "Update fastscroll" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Update fastscroll" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
* | | | | am 3cc6f5b4: Merge "Update checkboxes" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Update checkboxes" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
* | | | | am 3b89e3a5: Merge "Updating rating stars" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Updating rating stars" into ics-mr0 | Justin Ho | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge "Work around race condition when shutting down a surface flinger surface." | Jack Palevich | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ | |||||
* \ \ \ \ | am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing."... | Martijn Coenen | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 | Martijn Coenen | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ | |||||
* | \ \ \ \ | am 615858a8: Merge "Indicate screen off condition to audio framework." into i... | Eric Laurent | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Indicate screen off condition to audio framework." into ics-mr0 | Eric Laurent | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0 | Jamie Gennis | 2011-10-14 | 1 | -25/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Surface: fix a protected buffer test" into ics-mr0 | Jamie Gennis | 2011-10-14 | 1 | -25/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Surface: fix a protected buffer test | Jamie Gennis | 2011-10-12 | 1 | -25/+2 |
* | | | | | | | | am 7362e0d8: Merge "Adjust text sizes for better behavior under user scaling.... | Daniel Sandler | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0 | Daniel Sandler | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | am c02c33e5: Merge "docs: misc changes to overview and add known issues link ... | Scott Main | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "docs: misc changes to overview and add known issues link to sdk tools ... | Scott Main | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when ... | satok | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.... | satok | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | am 83e160d3: Fix build. | Jim Miller | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
* | | | | | | | | | Merge "Bug 5420741: exception when rotating device while suggestion popup is ... | Gilles Debunne | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ | Merge "Spell checher's language synced with keyboard." | Gilles Debunne | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
* | | | | | | | | | | am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE,... | Joe Fernandez | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge "docs: add developer guide cross-references, Project ACRE, Round 2" int... | Joe Fernandez | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption passwo... | Christopher Tate | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge "DO NOT MERGE - Require device encryption password for adb backup/resto... | Christopher Tate | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | am 00005385: Merge "Use ringer assets for notification volume since the two v... | Amith Yamasani | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge "Use ringer assets for notification volume since the two volumes are ti... | Amith Yamasani | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | am 33210ec1: Merge "change android beam sample name" into ics-mr0 | Scott Main | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge "change android beam sample name" into ics-mr0 | Scott Main | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility manageme... | Jim Miller | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "Fix 5358124: Better transport control visibility management in lock sc... | Jim Miller | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | am ed37b1bf: Merge "Shrink the ticker\'s icon to match the status bar." into ... | Daniel Sandler | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "Shrink the ticker's icon to match the status bar." into ics-mr0 | Daniel Sandler | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | am 43642ab9: Merge "Stat icons for phone are now the right size" into ics-mr0 | Peter Ng | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "Stat icons for phone are now the right size" into ics-mr0 | Peter Ng | 2011-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d82cc1de: Merge "Fixup JNI" into ics-mr0 | John Reck | 2011-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |