summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* SurfaceFlinger: make sync transactions explicitJamie Gennis2011-10-146-31/+53
* Merge "Make launchtestxlw use constant."Stephen Hines2011-10-140-0/+0
|\
* \ am e95aaf06: Merge "Update indicator_code lock assets" into ics-mr0Justin Ho2011-10-140-0/+0
|\ \
| * \ Merge "Update indicator_code lock assets" into ics-mr0Justin Ho2011-10-140-0/+0
| |\ \
* | \ \ am 8b319150: Merge "Update text select handles" into ics-mr0Justin Ho2011-10-140-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update text select handles" into ics-mr0Justin Ho2011-10-140-0/+0
| |\ \ \ | | |/ /
* | | | am 048e5c80: Merge "Update spinners" into ics-mr0Justin Ho2011-10-140-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update spinners" into ics-mr0Justin Ho2011-10-140-0/+0
| |\ \ \ | | |/ /
* | | | am 4a6f76da: Merge "Updated scrubber_control assets" into ics-mr0Justin Ho2011-10-140-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Updated scrubber_control assets" into ics-mr0Justin Ho2011-10-140-0/+0
| |\ \ \ | | |/ /
* | | | am 64ba25de: Merge "Update fastscroll" into ics-mr0Justin Ho2011-10-140-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update fastscroll" into ics-mr0Justin Ho2011-10-140-0/+0
| |\ \ \ | | |/ /
* | | | am 3cc6f5b4: Merge "Update checkboxes" into ics-mr0Justin Ho2011-10-140-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update checkboxes" into ics-mr0Justin Ho2011-10-140-0/+0
| |\ \ \ | | |/ /
* | | | am 3b89e3a5: Merge "Updating rating stars" into ics-mr0Justin Ho2011-10-140-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Updating rating stars" into ics-mr0Justin Ho2011-10-140-0/+0
| |\ \ \ | | |/ /
* | | | Merge "Work around race condition when shutting down a surface flinger surface."Jack Palevich2011-10-140-0/+0
|\ \ \ \
* \ \ \ \ am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing."...Martijn Coenen2011-10-140-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0Martijn Coenen2011-10-140-0/+0
| |\ \ \ \
* | \ \ \ \ am 615858a8: Merge "Indicate screen off condition to audio framework." into i...Eric Laurent2011-10-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Indicate screen off condition to audio framework." into ics-mr0Eric Laurent2011-10-140-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0Jamie Gennis2011-10-141-25/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Surface: fix a protected buffer test" into ics-mr0Jamie Gennis2011-10-141-25/+2
| |\ \ \ \ \ \
| | * | | | | | Surface: fix a protected buffer testJamie Gennis2011-10-121-25/+2
* | | | | | | | am 7362e0d8: Merge "Adjust text sizes for better behavior under user scaling....Daniel Sandler2011-10-140-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0Daniel Sandler2011-10-140-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am c02c33e5: Merge "docs: misc changes to overview and add known issues link ...Scott Main2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "docs: misc changes to overview and add known issues link to sdk tools ...Scott Main2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when ...satok2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed....satok2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | am 83e160d3: Fix build.Jim Miller2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
* | | | | | | | | Merge "Bug 5420741: exception when rotating device while suggestion popup is ...Gilles Debunne2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Spell checher's language synced with keyboard."Gilles Debunne2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
* | | | | | | | | | am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE,...Joe Fernandez2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "docs: add developer guide cross-references, Project ACRE, Round 2" int...Joe Fernandez2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption passwo...Christopher Tate2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "DO NOT MERGE - Require device encryption password for adb backup/resto...Christopher Tate2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ am 00005385: Merge "Use ringer assets for notification volume since the two v...Amith Yamasani2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Use ringer assets for notification volume since the two volumes are ti...Amith Yamasani2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 33210ec1: Merge "change android beam sample name" into ics-mr0Scott Main2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "change android beam sample name" into ics-mr0Scott Main2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility manageme...Jim Miller2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Fix 5358124: Better transport control visibility management in lock sc...Jim Miller2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am ed37b1bf: Merge "Shrink the ticker\'s icon to match the status bar." into ...Daniel Sandler2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Shrink the ticker's icon to match the status bar." into ics-mr0Daniel Sandler2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 43642ab9: Merge "Stat icons for phone are now the right size" into ics-mr0Peter Ng2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Stat icons for phone are now the right size" into ics-mr0Peter Ng2011-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d82cc1de: Merge "Fixup JNI" into ics-mr0John Reck2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /