summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in pa...Scott Main2010-10-151-5/+6
|\
| * am fda5b19c: Merge "docs: fix typo; surface dev guide link in package descrip...Scott Main2010-10-151-5/+6
| |\
| | * docs: fix typo; surface dev guide link in package descriptionScott Main2010-10-151-5/+6
* | | Merge a851d8d0 from gingerbreadJean-Baptiste Queru2010-10-1510-807/+9
|\ \ \ | |/ /
| * | Merge "NFC: Move NFC service implementation out of system_server." into ginge...Nick Pelly2010-10-1510-807/+9
| |\ \
| | * | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-1510-807/+9
* | | | am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into ginger...Brad Fitzpatrick2010-10-152-3/+21
|\ \ \ \ | |/ / /
| * | | Don't crash on null Vibrator during reboot.Brad Fitzpatrick2010-10-142-3/+21
| |/ /
* | | am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab throug...Daniel Lehmann2010-10-143-3/+54
|\ \ \ | |/ /
| * | Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContac...Daniel Lehmann2010-10-143-3/+54
| |\ \
| | * | DO NOT MERGE: Private API to pass the selected tab through QuickContactsDaniel Lehmann2010-10-143-3/+54
* | | | am 8b525c07: Merge "Check for state before disconnecting." into gingerbreadJaikumar Ganesh2010-10-141-0/+5
|\ \ \ \ | |/ / /
| * | | Merge "Check for state before disconnecting." into gingerbreadJaikumar Ganesh2010-10-141-0/+5
| |\ \ \
| | * | | Check for state before disconnecting.Jaikumar Ganesh2010-10-141-0/+5
| | |/ /
* | | | am 53ea7f58: Merge "Really leave text selection mode when using the trackball...Gilles Debunne2010-10-141-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Really leave text selection mode when using the trackball." into ginge...Gilles Debunne2010-10-141-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Really leave text selection mode when using the trackball.Gilles Debunne2010-10-131-0/+1
* | | | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-0/+9
|\ \ \ \ | |/ / /
| * | | Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-0/+9
| |\ \ \ | | |/ / | |/| |
| | * | OBB: use PBKDF2 for key generation.Kenny Root2010-10-131-0/+9
* | | | am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbreadJaikumar Ganesh2010-10-132-8/+8
|\ \ \ \ | |/ / /
| * | | Merge "Remove STOPSHIP and reduce log spam." into gingerbreadJaikumar Ganesh2010-10-132-8/+8
| |\ \ \
| | * | | Remove STOPSHIP and reduce log spam.Jaikumar Ganesh2010-10-132-8/+8
* | | | | am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly"...Vasu Nori2010-10-132-1/+60
|\ \ \ \ \ | |/ / / /
| * | | | Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerb...Vasu Nori2010-10-132-1/+60
| |\ \ \ \
| | * | | | bug:3069735 in Download UI app, handle deletes correctlyVasu Nori2010-10-132-1/+60
* | | | | | am c008ca96: Merge "Work around for errant headsets." into gingerbreadJaikumar Ganesh2010-10-134-9/+52
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Work around for errant headsets." into gingerbreadJaikumar Ganesh2010-10-134-9/+52
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Work around for errant headsets.Jaikumar Ganesh2010-10-134-9/+52
* | | | | | am 998c6777: Merge "Never show overscroll if the page scrolls at all." into g...Mindy Pereira2010-10-131-34/+55
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Never show overscroll if the page scrolls at all." into gingerbreadMindy Pereira2010-10-131-34/+55
| |\ \ \ \ \
| | * | | | | Never show overscroll if the page scrolls at all.Mindy Pereira2010-10-131-34/+55
* | | | | | | am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull."...Mindy Pereira2010-10-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Reduce the time it takes to decay the glow after a pull." into gingerb...Mindy Pereira2010-10-131-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Reduce the time it takes to decay the glow after a pull.Mindy Pereira2010-10-131-2/+2
| | |/ / / /
* | | | | | am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into ginger...Kenny Root2010-10-131-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "OBB: Change documentation to reflect reality" into gingerbreadKenny Root2010-10-131-3/+3
| |\ \ \ \ \
| | * | | | | OBB: Change documentation to reflect realityKenny Root2010-10-131-3/+3
| | | |_|/ / | | |/| | |
* | | | | | am e6ae5c39: Merge "Add shutdown assurance" into gingerbreadKenny Root2010-10-131-4/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add shutdown assurance" into gingerbreadKenny Root2010-10-131-4/+29
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add shutdown assuranceKenny Root2010-10-131-4/+29
| | |/ / /
* | | | | am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbreadWink Saville2010-10-131-4/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix NPE caused by Change I4df27119." into gingerbreadWink Saville2010-10-131-4/+9
| |\ \ \ \
| | * | | | Fix NPE caused by Change I4df27119.Wink Saville2010-10-131-4/+9
* | | | | | am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbreadNick Pelly2010-10-131-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add missing native methods to fix boot." into gingerbreadNick Pelly2010-10-131-0/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add missing native methods to fix boot.Nick Pelly2010-10-131-0/+4
* | | | | | am dfc07279: Line up WebTextView text with the page.Leon Scroggins2010-10-131-0/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Line up WebTextView text with the page.Leon Scroggins2010-10-131-0/+17
| |/ / / /
* | | | | am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. D...Jaikumar Ganesh2010-10-121-1/+1
|\ \ \ \ \ | |/ / / /