OSDN Git Service

(root) / android-x86 / frameworks-base.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp
[android-x86/frameworks-base.git] / core /
2011-02-25 Xavier Ducrohetresolved conflicts for merge of 86e43034 to honeycomb... tree | commitdiff
2011-02-25 Xavier Ducrohetresolved conflicts for merge of a4350fc0 to gingerbread... tree | commitdiff
2011-02-24 Xavier DucrohetMerge "LayoutLib: Original import of Honeycomb's layout... tree | commitdiff
2011-02-24 Eric Fischeram 1c38872f: Merge "Import revised translations. DO... tree | commitdiff
2011-02-24 Eric FischerMerge "Import revised translations. DO NOT MERGE"... tree | commitdiff
2011-02-24 Wink Savilleam 0dc8618d: Do not start RILReceiver if wifi-only. tree | commitdiff
2011-02-24 Eric FischerImport revised translations. DO NOT MERGE tree | commitdiff
2011-02-24 repo syncam be2ed6d6: resolved conflicts for merge of c96b6690... tree | commitdiff
2011-02-24 repo syncresolved conflicts for merge of c96b6690 to gingerbread... tree | commitdiff
2011-02-24 Alon AlbertMerge "DO NOT MERGE - Increasing timeout to 60 sec... tree | commitdiff
2011-02-24 Jason Chenam 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE... tree | commitdiff
2011-02-24 Jason Chenam 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a... tree | commitdiff
2011-02-24 Irfan Sheriffam 5107eea6: Merge "DO NOT MERGE Add support for backgr... tree | commitdiff
2011-02-24 Jason ChenMerge "DO NOT MERGE Cherry-pick of Ie4026a7c back to... tree | commitdiff
2011-02-24 Dianne HackbornDO NOT MERGE Cherry-pick of Ie4026a7c back to GB tree | commitdiff
2011-02-24 Irfan SheriffMerge "DO NOT MERGE Add support for background scanning... tree | commitdiff
2011-02-24 Scott Mainam 201959af: Merge "docs: fix sensorevent code snippets... tree | commitdiff
2011-02-23 Scott MainMerge "docs: fix sensorevent code snippets bug: 3480932... tree | commitdiff
2011-02-23 Eric Fischeram 32751e31: Merge "Import revised translations. DO... tree | commitdiff
2011-02-23 Eric FischerMerge "Import revised translations. DO NOT MERGE"... tree | commitdiff
2011-02-23 Irfan Sheriffam a46a5cba: Merge "DO NOT MERGE No backup of country... tree | commitdiff
2011-02-23 Irfan SheriffMerge "DO NOT MERGE No backup of country and sleep... tree | commitdiff
2011-02-23 Scott Mainam c516c771: docs: fix md5 sums tree | commitdiff
2011-02-23 Alon AlbertDO NOT MERGE - Increasing timeout to 60 sec tree | commitdiff
2011-02-23 Irfan SheriffDO NOT MERGE No backup of country and sleep policy tree | commitdiff
2011-02-23 Jamie Gennisam 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes... tree | commitdiff
2011-02-23 Jamie Gennisam fa238f03: Merge "egl: fixes for object refcounts... tree | commitdiff
2011-02-23 Jamie GennisMerge "egl: fixes for object refcounts" into gingerbread tree | commitdiff
2011-02-23 Scott Mainam 2788e4f9: docs: fix some typos tree | commitdiff
2011-02-23 Scott Maindocs: fix sensorevent code snippets tree | commitdiff
2011-02-23 Scott Maindocs: fix some typos tree | commitdiff
2011-02-23 Irfan SheriffDO NOT MERGE Add support for background scanning tree | commitdiff
2011-02-23 Justin Hoam da34ab21: am 9208875e: Updated iconography for netwo... tree | commitdiff
2011-02-23 Alon Albertam 1aba843d: am ccc802e1: Merge "Support quoted paramet... tree | commitdiff
2011-02-23 Justin Hoam 9208875e: Updated iconography for network status... tree | commitdiff
2011-02-23 Alon Albertam ccc802e1: Merge "Support quoted parameters" into... tree | commitdiff
2011-02-23 Robert Lyam c6c6fe93: Merge "doc change: fix missing code ending... tree | commitdiff
2011-02-23 Scott Mainam 47928f89: Merge "docs: fix broken links" into honeycomb tree | commitdiff
2011-02-23 James Dongam 6c9b500f: Merge "Added more warnings in javadoc... tree | commitdiff
2011-02-23 Scott Mainam 0ea4f0d7: Merge "docs: update highlights doc to... tree | commitdiff
2011-02-23 Scott Mainam 9d5f35d9: Merge "docs: add breadcrumb trails to... tree | commitdiff
2011-02-23 Roman Nurikam cba8efdf: Add more tags to the RenderScript sample... tree | commitdiff
2011-02-23 Dirk Doughertyam 7036d76a: Merge "Doc change: Add doc for GL texture... tree | commitdiff
2011-02-23 Roman Nurikam 4f4cab75: Merge "Document support for WebM/VP8 decod... tree | commitdiff
2011-02-23 Nick Pellyam beb01c93: Merge "DO NOT MERGE." into honeycomb tree | commitdiff
2011-02-23 Scott Mainam 4d62ef25: docs: revert ndk r6 tree | commitdiff
2011-02-23 Scott Mainam f870c5af: docs: add new-child tags to hide the ... tree | commitdiff
2011-02-23 Scott Mainam 1f694390: docs: move 3.0 optimizing doc into the... tree | commitdiff
2011-02-22 Maarten Hooftam 62f40c8b: (-s ours) am 99cca89f: Merge "Import revis... tree | commitdiff
2011-02-22 Romain Guyam ad492161: am a2090bea: am 7118bdec: Merge "Fix for... tree | commitdiff
2011-02-22 Dirk DoughertyMerge "Doc change: Add doc for GL texture declaration... tree | commitdiff
2011-02-22 Roman NurikMerge "Document support for WebM/VP8 decoding." into... tree | commitdiff
2011-02-22 Alon AlbertMerge "Support quoted parameters" into gingerbread tree | commitdiff
2011-02-22 Nick PellyMerge "DO NOT MERGE." into honeycomb tree | commitdiff
2011-02-20 Dirk Doughertyam 301431d9: Doc change: Final diff report for API 11. tree | commitdiff
2011-02-19 Scott Mainresolved conflicts for merge of b842629c to honeycomb... tree | commitdiff
2011-02-18 Maarten Hooftam 99cca89f: Merge "Import revised translations. DO... tree | commitdiff
2011-02-18 Scott Mainam e4da3934: Merge "docs: move new AIDL doc back into... tree | commitdiff
2011-02-18 Scott MainMerge "docs: move new AIDL doc back into the existing... tree | commitdiff
2011-02-18 Scott Mainam 163413f4: Merge "docs: update getting started doc... tree | commitdiff
2011-02-18 Alon AlbertSupport quoted parameters tree | commitdiff
2011-02-18 Romain Guyam a2090bea: am 7118bdec: Merge "Fix for #12945: Progre... tree | commitdiff
2011-02-18 Romain Guyam 7118bdec: Merge "Fix for #12945: ProgressBar.setMax... tree | commitdiff
2011-02-18 Nick PellyDO NOT MERGE. tree | commitdiff
2011-02-18 Romain GuyMerge "Fix for #12945: ProgressBar.setMax() will always... tree | commitdiff
2011-02-18 Michael KrehanFix for #12945: ProgressBar.setMax() will always redraw. tree | commitdiff
2011-02-18 Robert Lyam a58f58da: Merge "Doc change: fixing renderscript... tree | commitdiff
2011-02-18 Scott Mainam 0ddd2d1e: DO NOT MERGE Delete unused/broken samples... tree | commitdiff
2011-02-18 Maarten HooftMerge "Import revised translations. DO NOT MERGE"... tree | commitdiff
2011-02-17 Joe Malinam e766fcd5: DOC CHANGE: Bug 3396898 add attribute... tree | commitdiff
2011-02-16 Andreas Huberam 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respo... tree | commitdiff
2011-02-16 Andreas Huberam dbe09da6: DO NOT MERGE: Respond to RTSP server-... tree | commitdiff
2011-02-16 Scott Mainam 0643d7c4: docs: add new tag for tasks doc tree | commitdiff
2011-02-16 Andy Stadleram b1835085: Merge "@hide DPM global proxy settings... tree | commitdiff
2011-02-16 Andy StadlerMerge "@hide DPM global proxy settings" into honeycomb tree | commitdiff
2011-02-16 Scott Mainresolved conflicts for merge of f722cecd to honeycomb... tree | commitdiff
2011-02-16 Scott MainMerge "docs: update homepage for 3.0 announcement"... tree | commitdiff
2011-02-16 Robert Greenwaltam de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE... tree | commitdiff
2011-02-16 Andy Stadler@hide DPM global proxy settings tree | commitdiff
2011-02-16 Robert Greenwaltam 3259d885: Merge "DO NOT MERGE - backport of l92a02b3... tree | commitdiff
2011-02-16 Robert GreenwaltMerge "DO NOT MERGE - backport of l92a02b31 from master... tree | commitdiff
2011-02-16 Eric Fischeram 874ae43c: Merge "Import revised translations. DO... tree | commitdiff
2011-02-16 Eric FischerMerge "Import revised translations. DO NOT MERGE"... tree | commitdiff
2011-02-16 Alon Albertam b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE... tree | commitdiff
2011-02-16 Alon Albertam be5f82ab: Merge "DO NOT MERGE - Clear backoffs on... tree | commitdiff
2011-02-16 Scott Mainam 796ce77a: docs: add breadcrumbs to articles and... tree | commitdiff
2011-02-16 Alon AlbertMerge "DO NOT MERGE - Clear backoffs on reconnect"... tree | commitdiff
2011-02-16 Eric FischerImport revised translations. DO NOT MERGE tree | commitdiff
2011-02-16 Alon AlbertDO NOT MERGE - Clear backoffs on reconnect tree | commitdiff
2011-02-16 daniel_tomasam 99e267eb: am 7bcd2c62: New API added in NfcAdapter... tree | commitdiff
2011-02-16 daniel_tomasam 7bcd2c62: New API added in NfcAdapter to enable... tree | commitdiff
2011-02-16 daniel_tomasNew API added in NfcAdapter to enable/disable SE card... tree | commitdiff
2011-02-16 Nick Pellyam 8c8e9d9a: am 1df862a4: Minor doc update. tree | commitdiff
2011-02-16 Nick Pellyam 1df862a4: Minor doc update. tree | commitdiff
2011-02-16 Scott Mainam f79bbc30: Merge "docs: edit doc titles to match... tree | commitdiff
2011-02-16 Nick PellyMinor doc update. tree | commitdiff
2011-02-16 Andreas Huberam 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE... tree | commitdiff
2011-02-16 Andreas Huberam 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport... tree | commitdiff
2011-02-16 Andreas HuberMerge "DO NOT MERGE: Derive the Transport "source"... tree | commitdiff
2011-02-16 Robert Lyam c3ebf27a: am 4bebbe5f: Merge "Adding package summary... tree | commitdiff
next
frameworks/base
About OSDN
Find Software
Develop Software
Help