summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "fix a system crash that occurs when ChooseAccountActivity is restarted...Fred Quintana2010-03-011-8/+9
|\
| * fix a system crash that occurs when ChooseAccountActivity isFred Quintana2010-03-011-8/+9
* | Let apps change the bottom strip in TabWidget.Romain Guy2010-03-015-39/+216
* | Merge "register a logging func with sqlite, to get extra info on errors"Vasu Nori2010-03-011-27/+42
|\ \
| * | register a logging func with sqlite, to get extra info on errorsVasu Nori2010-03-011-27/+42
* | | Merge "Bug 2464063"Paul Westbrook2010-03-011-8/+0
|\ \ \
| * | | Bug 2464063Paul Westbrook2010-03-011-8/+0
* | | | fix the buildJoe Onorato2010-03-011-1/+2
* | | | am 3ca122df: am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCor...Grace Kloba2010-03-011-0/+8
|\ \ \ \
| * \ \ \ am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response...Grace Kloba2010-03-011-0/+8
| |\ \ \ \
| | * \ \ \ Merge "If we get TOUCH_UP before getting the WebCore's response for TOUCH_DOW...Grace Kloba2010-03-011-0/+8
| | |\ \ \ \
| | | * | | | If we get TOUCH_UP before getting the WebCore'sGrace Kloba2010-03-011-0/+8
* | | | | | | Merge "Switch the services library to using the new Slog"Joe Onorato2010-03-0167-1843/+1862
|\ \ \ \ \ \ \
| * | | | | | | Switch the services library to using the new SlogJoe Onorato2010-03-0167-1843/+1862
* | | | | | | | Merge "If zoom scale is set to minimum, treat it as in overview mode."Grace Kloba2010-03-011-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | If zoom scale is set to minimum, treat it as in overviewGrace Kloba2010-03-011-0/+6
* | | | | | | | Merge "Add new Slog class."Joe Onorato2010-03-013-18/+122
|\ \ \ \ \ \ \ \
| * | | | | | | | Add new Slog class.Joe Onorato2010-03-013-18/+122
* | | | | | | | | Merge "fix a bug where if a syncmanager gets back a SyncAlreadyInProgress err...Fred Quintana2010-03-012-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix a bug where if a syncmanager gets back a SyncAlreadyInProgress errorFred Quintana2010-03-012-4/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | am a630dcdb: am ecde72fe: Ensure the IME is rendered above the surface when w...Derek Sollenberger2010-03-011-2/+8
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am ecde72fe: Ensure the IME is rendered above the surface when we z-order the...Derek Sollenberger2010-03-011-2/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Ensure the IME is rendered above the surface when we z-order the surface to b...Derek Sollenberger2010-03-011-2/+8
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge "Take headers into account when expanding a ExpListView group."Gilles Debunne2010-03-011-3/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Take headers into account when expanding a ExpListView group.Gilles Debunne2010-03-011-3/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "resolved conflicts for merge of 4dcd2ee8 to master"Dianne Hackborn2010-03-011-5/+19
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of 4dcd2ee8 to masterDianne Hackborn2010-03-011-5/+19
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge from open-source masterThe Android Open Source Project2010-03-011-5/+19
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix problem with restarting an application process that recently has died.Magnus Edlund2010-03-011-5/+19
* | | | | | | | | | Merge "define the "seen" column for sms and pdu tables."Wei Huang2010-03-013-31/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | define the "seen" column for sms and pdu tables.Wei Huang2010-03-013-31/+37
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "cleanup Exit car mode in UI."Dianne Hackborn2010-03-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | cleanup Exit car mode in UI.Bernd Holzhey2010-03-011-1/+1
* | | | | | | | | | Merge "Add a new WebCoreWorker thread to handle the tasks which should not bl...Grace Kloba2010-03-019-204/+418
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a new WebCoreWorker thread to handle the tasksGrace Kloba2010-03-019-204/+418
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "check offset and don't crash"Mark Wagner2010-03-011-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | check offset and don't crashMark Wagner2010-03-011-1/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "Removes a Geolocation test from the DumpRenderTree skipped list"Steve Block2010-03-011-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removes a Geolocation test from the DumpRenderTree skipped listSteve Block2010-02-251-1/+0
* | | | | | | | | | | Merge "Adds to DumpRenderTree the ability to look for Android-specific results"Steve Block2010-03-013-14/+46
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Adds to DumpRenderTree the ability to look for Android-specific resultsSteve Block2010-02-263-14/+46
* | | | | | | | | | | Make nativeMoveCursorToNextInput return a boolean and use it.Leon Scroggins2010-03-012-10/+11
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Bug 2306842"Paul Westbrook2010-03-011-1/+61
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Bug 2306842Paul Westbrook2010-02-261-1/+61
* | | | | | | | | | Merge "Put _SYNC_LOCAL_ID into event entities"Marc Blank2010-03-011-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Put _SYNC_LOCAL_ID into event entitiesMarc Blank2010-02-281-0/+1
* | | | | | | | | | | Merge "Stop previous ringtone when silent is selected. Bug 2256593."Dave Sparks2010-03-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Stop previous ringtone when silent is selected. Bug 2256593.Dave Sparks2010-02-261-0/+1
* | | | | | | | | | | | Merge "force plugins to render on top of browser content."Derek Sollenberger2010-03-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | force plugins to render on top of browser content.Derek Sollenberger2010-03-011-0/+3
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |