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 a4350fc0 to gingerbread-plus-aosp
[android-x86/frameworks-base.git] / services /
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 repo syncresolved conflicts for merge of c96b6690 to gingerbread... tree | commitdiff
2011-02-24 Jason Chenam 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a... 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 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-18 Maarten Hooftam 99cca89f: Merge "Import revised translations. DO... 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 Maarten HooftMerge "Import revised translations. DO NOT MERGE"... tree | commitdiff
2011-02-16 Andreas Huberam dbe09da6: DO NOT MERGE: Respond to RTSP server-... 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 Alon Albertam be5f82ab: Merge "DO NOT MERGE - Clear backoffs on... tree | commitdiff
2011-02-16 daniel_tomasam 7bcd2c62: New API added in NfcAdapter to enable... tree | commitdiff
2011-02-16 Nick Pellyam 1df862a4: Minor doc update. tree | commitdiff
2011-02-16 Andreas Huberam 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport... tree | commitdiff
2011-02-16 Robert Lyam 4bebbe5f: Merge "Adding package summary for nfc... tree | commitdiff
2011-02-15 John Wangam 29853a35: Merge "Only decode EXT1 tag when it is... tree | commitdiff
2011-02-15 Andreas Huberam d1ba051a: DO NOT MERGE: Work around several issues... tree | commitdiff
2011-02-14 Scott Mainam d4952380: fix md5sum for windows installer tree | commitdiff
2011-02-12 Robert GreenwaltDO NOT MERGE - backport of l92a02b31 from master tree | commitdiff
2011-02-11 Robert Lyam 322891c6: Doc change: nfc dev guide tree | commitdiff
2011-02-11 Jean-Baptiste Queruam 6901f963: am 93552de8: Merge "stubs" tree | commitdiff
2011-02-11 Jean-Baptiste Queruam 93552de8: Merge "stubs" tree | commitdiff
2011-02-10 Gilles Debunneam 2050de5b: Text selection is broken. tree | commitdiff
2011-02-09 Wink Savilleam 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb... tree | commitdiff
2011-02-09 Wink Savilleam 6e25789f: Merge "Telephony: Fix cb sms implementation" tree | commitdiff
2011-02-09 Mathias Agopianam ada1b6f2: Merge "fix [3421350] Killing a game that... tree | commitdiff
2011-02-09 Mathias AgopianMerge "fix [3421350] Killing a game that uses the accel... tree | commitdiff
2011-02-09 Scott Mainam 07cefd3c: add 2.3.3 announcement to site home page 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 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 b901c9ab: am 9204644d: Merge "Fix a race condition... tree | commitdiff
2011-02-07 Brad Fitzpatrickam 9204644d: Merge "Fix a race condition in NativeDaemo... tree | commitdiff
2011-02-07 Brad FitzpatrickMerge "Fix a race condition in NativeDaemonConnector" tree | commitdiff
2011-02-07 angaFix a race condition in NativeDaemonConnector tree | commitdiff
2011-02-07 Dianne Hackbornam 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race... tree | commitdiff
2011-02-07 Dianne Hackbornam bb2e1ef8: Merge "Fixing possible race condition." tree | commitdiff
2011-02-06 Dianne HackbornMerge "Fixing possible race condition." tree | commitdiff
2011-02-05 Kenny Rootam c94a9998: Merge "JPtextinput: Dont break emoji chara... 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 Gilles DebunneMerge "Blinking runnable is created only if text is... tree | commitdiff
2011-02-04 Gilles DebunneMerge "All runnable are stopped on detach. DO NOT MERGE... tree | commitdiff
2011-02-04 Gilles DebunneMerge "SelectAllOnFocus shows a higlighted text. DO... tree | commitdiff
2011-02-04 Kenny RootMerge "JPtextinput: Dont break emoji characters when... tree | commitdiff
2011-02-04 Brad Fitzpatrickam f664d6f9: am b083d3b8: Merge "Initialize resampling... tree | commitdiff
2011-02-04 Brad Fitzpatrickam b083d3b8: Merge "Initialize resampling buffer per... tree | commitdiff
2011-02-04 Brad FitzpatrickMerge "Initialize resampling buffer per track." tree | commitdiff
2011-02-04 Yuuhi YamaguchiInitialize resampling buffer per track. tree | commitdiff
2011-02-04 Joe Onoratoam 163c28b5: Merge "Managed dialogs should run on the... tree | commitdiff
2011-02-04 Mathias Agopianfix [3421350] Killing a game that uses the acceleromete... tree | commitdiff
2011-02-04 Nick Pellyam 40684946: Merge "Fix docs type that broke build... 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 Queruam db71bda6: Merge from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste Queruam 8444023f: Merge from open-source gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge from open-source gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste Queruam 375afcd5: am 4b8ad9ef: Merge from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge ee4c17ee from gingerbread tree | commitdiff
2011-02-03 Jean-Baptiste QueruMerge from open-source gingerbread tree | commitdiff
2011-02-03 Scott Mainam ca69a634: fix broken links, update the dev guide... tree | commitdiff
2011-02-03 Scott Mainam 94a6c689: Merge "wholesale manual merge of docs... tree | commitdiff
2011-02-03 Scott Mainam 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76f... tree | commitdiff
2011-02-02 Bill Gruberam df71cabb: cherrypick Change-Id: Ica1b68a1687917432d3... tree | commitdiff
2011-02-02 Scott Mainam 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47... tree | commitdiff
2011-02-02 Scott Mainam 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512... tree | commitdiff
2011-02-02 Irfan Sheriffresolved conflicts for merge of 0a4b3fd9 to gingerbread... tree | commitdiff
2011-02-02 Jean-Baptiste Queruam 05059b5b: am 8226140c: Merge from gingerbread tree | commitdiff
2011-02-02 Jean-Baptiste Queruam 155b0ee0: Merge from open-source gingerbread tree | commitdiff
2011-02-02 Jean-Baptiste QueruMerge from gingerbread tree | commitdiff
2011-02-02 Jean-Baptiste QueruMerge from open-source gingerbread tree | commitdiff
2011-02-02 Eric Laurentam 3d4069a2: Allow TTY mode for GSM Phones tree | commitdiff
2011-02-01 Jean-Baptiste Queruam dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote... tree | commitdiff
2011-02-01 Nick Pellyam cbf0983e: Merge "Final final final Gingerbread MR... tree | commitdiff
2011-02-01 Nick PellyMerge "Final final final Gingerbread MR API changes... tree | commitdiff
2011-02-01 Jozef BABJAKFixing possible race condition. tree | commitdiff
2011-02-01 Dianne Hackbornam 7a7ed2b2: Merge "Do not check features in PackageMan... tree | commitdiff
2011-02-01 Dianne HackbornMerge "Do not check features in PackageManagerService... tree | commitdiff
2011-02-01 Kenny RootDo not check features in PackageManagerService DO NOT... tree | commitdiff
2011-02-01 Eric Fischeram a019d15b: Merge "Import revised translations. DO... tree | commitdiff
2011-01-31 Dianne Hackbornam e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeab... tree | commitdiff
2011-01-31 Jean-Baptiste Queruam a6fb375c: am 056340ac: Merge "stubs" tree | commitdiff
2011-01-31 Jeff Hamiltonam 113834c5: Commit the final API for level 10. tree | commitdiff
2011-01-31 Jean-Baptiste Queruam 8a2f3ecc: am 25503f1c: Merge from gingerbread tree | commitdiff
next
frameworks/base
About OSDN
Find Software
Develop Software
Help