summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Make launchtestxlw use constant."Stephen Hines2011-10-141-2/+2
|\
| * Make launchtestxlw use constant.Stephen Hines2011-10-131-2/+2
* | am e95aaf06: Merge "Update indicator_code lock assets" into ics-mr0Justin Ho2011-10-145-0/+0
|\ \
| * \ Merge "Update indicator_code lock assets" into ics-mr0Justin Ho2011-10-145-0/+0
| |\ \
| | * | Update indicator_code lock assetsJustin Ho2011-10-145-0/+0
* | | | am 8b319150: Merge "Update text select handles" into ics-mr0Justin Ho2011-10-143-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update text select handles" into ics-mr0Justin Ho2011-10-143-0/+0
| |\ \ \
| | * | | Update text select handlesJustin Ho2011-10-143-0/+0
| | |/ /
* | | | am 048e5c80: Merge "Update spinners" into ics-mr0Justin Ho2011-10-148-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update spinners" into ics-mr0Justin Ho2011-10-148-0/+0
| |\ \ \
| | * | | Update spinnersJustin Ho2011-10-148-0/+0
| | |/ /
* | | | am 4a6f76da: Merge "Updated scrubber_control assets" into ics-mr0Justin Ho2011-10-143-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Updated scrubber_control assets" into ics-mr0Justin Ho2011-10-143-0/+0
| |\ \ \
| | * | | Updated scrubber_control assetsJustin Ho2011-10-143-0/+0
| | |/ /
* | | | am 64ba25de: Merge "Update fastscroll" into ics-mr0Justin Ho2011-10-147-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update fastscroll" into ics-mr0Justin Ho2011-10-147-0/+0
| |\ \ \
| | * | | Update fastscrollJustin Ho2011-10-147-0/+0
| | |/ /
* | | | am 3cc6f5b4: Merge "Update checkboxes" into ics-mr0Justin Ho2011-10-1412-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Update checkboxes" into ics-mr0Justin Ho2011-10-1412-0/+0
| |\ \ \
| | * | | Update checkboxesJustin Ho2011-10-1412-0/+0
| | |/ /
* | | | am 3b89e3a5: Merge "Updating rating stars" into ics-mr0Justin Ho2011-10-1434-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Updating rating stars" into ics-mr0Justin Ho2011-10-1434-0/+0
| |\ \ \
| | * | | Updating rating starsJustin Ho2011-10-1434-0/+0
| | |/ /
* | | | Merge "Work around race condition when shutting down a surface flinger surface."Jack Palevich2011-10-141-3/+17
|\ \ \ \
| * | | | Work around race condition when shutting down a surface flinger surface.Jack Palevich2011-10-141-3/+17
* | | | | am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing."...Martijn Coenen2011-10-141-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0Martijn Coenen2011-10-141-0/+1
| |\ \ \ \
| | * | | | Remove NfcFragment from activity when no longer sharing.Martijn Coenen2011-10-141-0/+1
* | | | | | am 615858a8: Merge "Indicate screen off condition to audio framework." into i...Eric Laurent2011-10-141-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Indicate screen off condition to audio framework." into ics-mr0Eric Laurent2011-10-141-0/+6
| |\ \ \ \ \
| | * | | | | Indicate screen off condition to audio framework.Eric Laurent2011-10-141-0/+6
* | | | | | | 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-143-5/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0Daniel Sandler2011-10-143-5/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Adjust text sizes for better behavior under user scaling.Daniel Sandler2011-10-143-5/+17
* | | | | | | | | am c02c33e5: Merge "docs: misc changes to overview and add known issues link ...Scott Main2011-10-144-5/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "docs: misc changes to overview and add known issues link to sdk tools ...Scott Main2011-10-144-5/+11
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | docs: misc changes to overview and add known issues link to sdk tools notesScott Main2011-10-144-5/+11
* | | | | | | | | am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when ...satok2011-10-141-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed....satok2011-10-141-2/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.satok2011-10-151-2/+3
* | | | | | | | | am 83e160d3: Fix build.Jim Miller2011-10-141-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix build.Jim Miller2011-10-141-1/+1
* | | | | | | | | Merge "Bug 5420741: exception when rotating device while suggestion popup is ...Gilles Debunne2011-10-141-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug 5420741: exception when rotating device while suggestion popup is visibleGilles Debunne2011-10-121-0/+17
* | | | | | | | | | Merge "Spell checher's language synced with keyboard."Gilles Debunne2011-10-143-38/+118
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Spell checher's language synced with keyboard.Gilles Debunne2011-10-133-38/+118
| |/ / / / / / / / /
* | | | | | | | | | am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE,...Joe Fernandez2011-10-1414-13/+104
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |