summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge WebKit at r76408: Fix conflicts.Ben Murdoch2011-05-2313-239/+159
* Merge WebKit at r76408: Fix Makefiles.Ben Murdoch2011-05-234-2/+4
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231355-13430/+56258
* Fix position updateTeng-Hui Zhu2011-05-232-18/+15
*-. Reconcile with honeycomb-release honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-070-0/+0
| | |\
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-040-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-030-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-280-0/+0
| | | |\ | | |/ /
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | | |\
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | | |\ | | | |/ /
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-210-0/+0
| | | | |\ | | | |/ /
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-190-0/+0
| | | | |\
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-150-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-130-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | |\
| | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | |\
| | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-050-0/+0
| | | | | | | |\
| | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-040-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-010-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-310-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-280-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * try faster dashingMike Reed2011-03-251-7/+45
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-240-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-230-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-220-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Turns out args should not be decoded twice.Patrick Scott2011-03-211-3/+0
| | | | | | | | | | | | | | | * Fix native crashNicolas Roard2011-03-212-5/+10
| | | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-210-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Fix for missing invalsNicolas Roard2011-03-181-1/+1
| | | | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-180-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * Fix Browser ANRNicolas Roard2011-03-173-11/+16
| | | | | | | | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-170-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * Merge commit 'adff8fe3e93335625cc084a33dc0506581c2048d' into honeycomb-mr1-re...The Android Automerger2011-03-161-0/+4
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-160-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-150-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-140-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * | allow multiple invals to return first differenceCary Clark2011-03-112-19/+25
| | | | | | | | | | | | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-110-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * | Fix for gmail messages not showing after the first one.Nicolas Roard2011-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | |/ / /