summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-1022-299/+289
* Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"Steve Block2012-01-0914-39/+39
|\
| * Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0814-39/+39
* | Merge "Fix delete key with ContentEditable fields."George Mount2012-01-092-2/+64
|\ \ | |/ |/|
| * Fix delete key with ContentEditable fields.George Mount2012-01-092-2/+64
* | Merge "When loading progress is running, ask for redraw"Teng-Hui Zhu2012-01-061-0/+1
|\ \ | |/ |/|
| * When loading progress is running, ask for redrawTeng-Hui Zhu2012-01-061-0/+1
* | Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI."George Mount2012-01-061-189/+223
|\ \
| * | Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.George Mount2012-01-051-189/+223
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-063-9/+9
* | | Merge "Fix off-by-border RTL initial scrolling."George Mount2012-01-051-3/+2
|\ \ \
| * | | Fix off-by-border RTL initial scrolling.George Mount2011-12-201-3/+2
| |/ /
* | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-051-1/+1
|\ \ \
| * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-1/+1
* | | | am f6eccb79: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
|\ \ \ \
| * \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
| |\ \ \ \
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-040-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 00efa06c: (-s ours) am f62e398f: Merge "Enable History API. Do not merge."...Bart Sears2012-01-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f62e398f: Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| | |\ \ \ \ \
| | | * | | | | Enable History API. Do not merge.Ben Murdoch2012-01-041-0/+7
* | | | | | | | am 0d647bc2: (-s ours) am d13df54b: Merge "Fix crash with composited layers -...Bart Sears2012-01-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am d13df54b: Merge "Fix crash with composited layers - DO NOT MERGE" into ics...Bart Sears2012-01-043-4/+51
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix crash with composited layers - DO NOT MERGE" into ics-mr1Bart Sears2012-01-043-4/+51
| | |\ \ \ \ \ \
| | | * | | | | | Fix crash with composited layers - DO NOT MERGENicolas Roard2012-01-033-4/+51
| | | |/ / / / /
* | | | | | | | am 9a4df506: (-s ours) am 08a2aede: Merge "When in singlesurfacemode, resist ...Chris Craik2012-01-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 08a2aede: Merge "When in singlesurfacemode, resist switching out - DO NOT ...Chris Craik2012-01-041-0/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "When in singlesurfacemode, resist switching out - DO NOT MERGE" into i...Chris Craik2012-01-041-0/+7
| | |\ \ \ \ \ \
| | | * | | | | | When in singlesurfacemode, resist switching out - DO NOT MERGEChris Craik2012-01-041-0/+7
| | | |/ / / / /
* | | | | | | | am acd6e277: (-s ours) am 2cc4497f: Merge "When loading new content, reset zo...Chris Craik2012-01-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2cc4497f: Merge "When loading new content, reset zoom state - DO NOT MERGE...Chris Craik2012-01-041-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "When loading new content, reset zoom state - DO NOT MERGE" into ics-mr1Chris Craik2012-01-041-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | When loading new content, reset zoom state - DO NOT MERGEChris Craik2012-01-041-0/+1
| | | |/ / / / /
* | | | | | | | am e5b68556: am 41aebb2b: Return the tile generation thread to default priority.Chris Craik2012-01-041-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 41aebb2b: Return the tile generation thread to default priority.Chris Craik2012-01-041-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Return the tile generation thread to default priority.Chris Craik2012-01-031-1/+1
| | |/ / / / /
* | | | | | | Merge "Rewrote validZip() with three-digit ZIP prefix."Victoria Lease2012-01-041-74/+178
|\ \ \ \ \ \ \
| * | | | | | | Rewrote validZip() with three-digit ZIP prefix.Victoria Lease2012-01-041-74/+178
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Allow 0 pt fonts in SkPaint."Derek Sollenberger2012-01-041-5/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Allow 0 pt fonts in SkPaint.Derek Sollenberger2012-01-041-5/+1
* | | | | | | Merge "Remove unnecessary gl texture wrap setting"Teng-Hui Zhu2012-01-041-2/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Remove unnecessary gl texture wrap settingTeng-Hui Zhu2012-01-041-2/+0
* | | | | | | Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"Steve Block2012-01-0418-79/+79
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0318-79/+79
* | | | | | | Merge "Employ the transfer queue to the pure color tiles"Teng-Hui Zhu2012-01-049-80/+132
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Employ the transfer queue to the pure color tilesTeng-Hui Zhu2012-01-039-80/+132
* | | | | | | Fix AppCache when either no path or an invalid path is suppliedSteve Block2012-01-041-10/+26
| |/ / / / / |/| | | | |
* | | | | | Merge "Change VerticalTextMap.cpp for VerticalWritingMode after fallback font...claireho2012-01-031-16/+22
|\ \ \ \ \ \
| * | | | | | Change VerticalTextMap.cpp for VerticalWritingMode after fallback font update.claireho2011-12-191-16/+22
| | |/ / / / | |/| | | |
* | | | | | Merge "Enable History API."Ben Murdoch2012-01-031-0/+7
|\ \ \ \ \ \
generated by cgit v1.1 at 2024-09-19 08:01:23 +0000