summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Implement the TODO items for VerticalTextMap.cppclaireho2012-01-131-5/+2
* Merge "Use audio_format_t consistently"Glenn Kasten2012-01-121-2/+2
|\
| * Use audio_format_t consistentlyGlenn Kasten2012-01-051-2/+2
* | am dc9c9187: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
|\ \
| * \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
| |\ \
| | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-110-0/+0
| | |\ \
* | | \ \ Merge "Initial NavCache removal"John Reck2012-01-114-157/+225
|\ \ \ \ \
| * | | | | Initial NavCache removalJohn Reck2012-01-114-157/+225
* | | | | | resolved conflicts for merge of 9cb81f0f to masterChris Craik2012-01-111-20/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am b627d5bd: Fully invalidate the pictureset when content size changesChris Craik2012-01-111-21/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fully invalidate the pictureset when content size changesChris Craik2012-01-101-21/+14
* | | | | | Merge "Native function to support restore the media player state"Teng-Hui Zhu2012-01-112-0/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Native function to support restore the media player stateTeng-Hui Zhu2012-01-102-0/+20
* | | | | | Fix code including Chromium headers to use WebKit LOG macro, rather than fram...Steve Block2012-01-111-7/+13
* | | | | | Simplify workaround for LOG_ASSERT conflictSteve Block2012-01-111-19/+6
* | | | | | Disable C++0x compatibility warningsSteve Block2012-01-111-0/+1
* | | | | | Avoid LOG_ASSERT conflicts between the framework and Chromium in AOSPSteve Block2012-01-111-0/+23
|/ / / / /
* | | | | Merge "A better fix to reduce overhead of GL texture wrap setting"Teng-Hui Zhu2012-01-101-0/+2
|\ \ \ \ \
| * | | | | A better fix to reduce overhead of GL texture wrap settingTeng-Hui Zhu2012-01-101-0/+2
* | | | | | Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"Steve Block2012-01-1022-299/+289
|\ \ \ \ \ \
| * | | | | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-1022-299/+289
* | | | | | | Merge "Revert a temporary WAR before ICS open source"Teng-Hui Zhu2012-01-101-4/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Revert a temporary WAR before ICS open sourceTeng-Hui Zhu2012-01-091-4/+0
* | | | | | | Draw GLExtras for each layer.Victoria Lease2012-01-0910-50/+109
| |/ / / / / |/| | | | |
* | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / /
generated by cgit v1.1 at 2024-08-08 21:01:10 +0000