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] / location /
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 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 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-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 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-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-18 Maarten Hooftam 99cca89f: Merge "Import revised translations. DO... 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 Robert Greenwaltam de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE... tree | commitdiff
2011-02-16 Robert Greenwaltam 3259d885: Merge "DO NOT MERGE - backport of l92a02b3... 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 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 Nick Pellyam 8c8e9d9a: am 1df862a4: Minor doc update. tree | commitdiff
2011-02-16 Nick Pellyam 1df862a4: Minor 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 Robert Lyam c3ebf27a: am 4bebbe5f: Merge "Adding package summary... tree | commitdiff
2011-02-16 Robert Lyam 4bebbe5f: Merge "Adding package summary for nfc... tree | commitdiff
2011-02-15 John Wangam 39014026: am 29853a35: Merge "Only decode EXT1 tag... tree | commitdiff
2011-02-15 John Wangam 29853a35: Merge "Only decode EXT1 tag when it is... tree | commitdiff
2011-02-15 Andreas Huberam e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work... tree | commitdiff
2011-02-15 Andreas Huberam d1ba051a: DO NOT MERGE: Work around several issues... tree | commitdiff
2011-02-14 Scott Mainam b269346c: am d4952380: fix md5sum for windows installer tree | commitdiff
2011-02-14 Scott Mainam d4952380: fix md5sum for windows installer tree | commitdiff
2011-02-11 Robert Lyresolved conflicts for merge of 810c1c0c to honeycomb... tree | commitdiff
2011-02-11 Robert Lyam 322891c6: Doc change: nfc dev guide tree | commitdiff
2011-02-11 Jean-Baptiste Queruam 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge... tree | commitdiff
2011-02-10 Gilles Debunneresolved conflicts for merge of 8e28ab22 to honeycomb... tree | commitdiff
2011-02-10 Wink Savilleam bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony... tree | commitdiff
2011-02-10 Mathias Agopianam d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing... tree | commitdiff
2011-02-10 Scott Mainam b605869c: am 07cefd3c: add 2.3.3 announcement to... tree | commitdiff
2011-02-10 Jeff Hamiltonam c1cc9ba6: am 58c9d472: Merge "More documentation... tree | commitdiff
2011-02-10 Dirk Doughertyam 8d56f6de: am a3f53afd: Merge "Doc change: Add versio... tree | commitdiff
2011-02-10 Nick Pellyam 47dac545: am 39cf3a44: Document NFC permissions. tree | commitdiff
2011-02-10 Jeff Hamiltonam 1ac35411: am 584afa8d: Merge "Improve the docs a... tree | commitdiff
2011-02-10 Eric Fischeram c1c31433: (-s ours) am be4b39d2: Merge "Import revis... tree | commitdiff
2011-02-10 Scott Mainam 129c7372: am 3c01a139: rename SIP doc title tree | commitdiff
2011-02-10 Scott Mainresolved conflicts for merge of 42f18194 to honeycomb... tree | commitdiff
2011-02-10 Katie McCormickresolved conflicts for merge of 690d31a6 to honeycomb... tree | commitdiff
2011-02-10 Gilles Debunneam 2050de5b: Text selection is broken. tree | commitdiff
2011-02-09 Mathias Agopianam ada1b6f2: Merge "fix [3421350] Killing a game that... tree | commitdiff
2011-02-09 Scott Mainam 07cefd3c: add 2.3.3 announcement to site home page tree | commitdiff
2011-02-09 Dirk Doughertyam be04bfd0: am 01967c0e: Merge "Doc change: Add diff... tree | commitdiff
2011-02-09 Gilles Debunneam 63bd55c7: am cdfe8999: Fix for multiple merge problem. tree | commitdiff
2011-02-09 Jeff Hamiltonam 58c9d472: Merge "More documentation updates for... tree | commitdiff
2011-02-09 Dirk Doughertyam a3f53afd: Merge "Doc change: Add version notes for... tree | commitdiff
2011-02-09 Nick Pellyam 39cf3a44: Document NFC permissions. tree | commitdiff
2011-02-09 Gilles Debunneresolved conflicts for merge of e04c1496 to honeycomb... tree | commitdiff
2011-02-09 Jeff Hamiltonam 584afa8d: Merge "Improve the docs a bit for foregrou... tree | commitdiff
2011-02-09 Eric Fischeram be4b39d2: Merge "Import revised translations. DO... tree | commitdiff
2011-02-09 Scott Mainam 3c01a139: rename SIP doc title tree | commitdiff
2011-02-09 Scott Mainam c442bc60: docs: move the SIP guide into guide/network/ tree | commitdiff
2011-02-09 Katie McCormickam 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2... tree | commitdiff
2011-02-09 Dirk Doughertyam 01967c0e: Merge "Doc change: Add diff report for... tree | commitdiff
2011-02-09 Gilles Debunneam cdfe8999: Fix for multiple merge problem. tree | commitdiff
2011-02-09 Gilles Debunneresolved conflicts for merge of c0728cc0 to gingerbread... tree | commitdiff
2011-02-07 Brad Fitzpatrickam a62bf8bb: am b901c9ab: am 9204644d: Merge "Fix a... tree | commitdiff
2011-02-07 Dianne Hackbornam 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing... tree | commitdiff
2011-02-05 Kenny Rootam c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinp... tree | commitdiff
2011-02-04 Gilles Debunneam 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking... tree | commitdiff
2011-02-04 Gilles Debunneam 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable... tree | commitdiff
2011-02-04 Gilles Debunneam 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnF... tree | commitdiff
2011-02-04 Gilles Debunneam 893ac28f: Merge "Blinking runnable is created only... tree | commitdiff
2011-02-04 Gilles Debunneam 8a6ba494: Merge "All runnable are stopped on detach... tree | commitdiff
2011-02-04 Gilles Debunneam 53841df2: Merge "SelectAllOnFocus shows a higlighted... tree | commitdiff
2011-02-04 Brad Fitzpatrickam cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initializ... tree | commitdiff
2011-02-04 Joe Onoratoam 2742c9c2: am 163c28b5: Merge "Managed dialogs should... tree | commitdiff
2011-02-04 Joe Onoratoam 163c28b5: Merge "Managed dialogs should run on the... tree | commitdiff
2011-02-04 Nick Pellyam 062443f2: am 40684946: Merge "Fix docs type that... tree | commitdiff
2011-02-04 Nick Pellyam 40684946: Merge "Fix docs type that broke build... tree | commitdiff
2011-02-04 Jean-Baptiste Queruam 501dbaea: am 6dbdcd55: am db71bda6: Merge from ginge... tree | commitdiff
2011-02-04 Scott Mainam 51768f4b: am 779f7410: Merge "cherrypick Change... tree | commitdiff
2011-02-04 Nick Pellyam 5394ef06: am 630ac8df: Merge "NFC documentation... tree | commitdiff
2011-02-03 Scott Mainam 779f7410: Merge "cherrypick Change-Id: I6053e6f20045... tree | commitdiff
2011-02-03 Nick Pellyam 630ac8df: Merge "NFC documentation overhaul." into... tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge 917d9ea1 tree | commitdiff
2011-02-03 Jean-Baptiste Queruam 8444023f: Merge from open-source gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste Queruam 236afa68: am 375afcd5: am 4b8ad9ef: Merge from ginge... tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste Queruam baaaca1c: Merge ee4c17ee from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge ee4c17ee from gingerbread tree | commitdiff
2011-02-03 Scott Mainam 2e5fea59: am ca69a634: fix broken links, update... tree | commitdiff
2011-02-03 Scott Mainam ca69a634: fix broken links, update the dev guide... tree | commitdiff
2011-02-03 Scott Mainam 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale... tree | commitdiff
2011-02-03 Scott Mainam 94a6c689: Merge "wholesale manual merge of docs... tree | commitdiff
2011-02-03 Scott Mainam 603b475e: am 4add7f3f: cherrypick Change-Id: I350a01... tree | commitdiff
2011-02-03 Scott Mainam 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76f... tree | commitdiff
2011-02-03 Bill Gruberam 930189f0: am df71cabb: cherrypick Change-Id: Ica1b68... tree | commitdiff
next
frameworks/base
About OSDN
Find Software
Develop Software
Help