OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycom...
[android-x86/frameworks-base.git]
/
Android.mk
2011-02-25
Svetoslav Ganov
resolved conflicts for merge of 66edf2bb to honeycomb...
blob
|
commitdiff
2011-02-25
Jeff Hamilton
am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
blob
|
commitdiff
2011-02-25
Xavier Ducrohet
am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib...
blob
|
commitdiff
2011-02-25
Xavier Ducrohet
resolved conflicts for merge of 86e43034 to honeycomb...
blob
|
commitdiff
2011-02-24
repo sync
am be2ed6d6: resolved conflicts for merge of c96b6690...
blob
|
commitdiff
2011-02-24
Jason Chen
am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-02-23
Jamie Gennis
am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes...
blob
|
commitdiff
2011-02-23
Justin Ho
am da34ab21: am 9208875e: Updated iconography for netwo...
blob
|
commitdiff
2011-02-23
Alon Albert
am 1aba843d: am ccc802e1: Merge "Support quoted paramet...
blob
|
commitdiff
2011-02-22
Maarten Hooft
am 62f40c8b: (-s ours) am 99cca89f: Merge "Import revis...
blob
|
commitdiff
2011-02-22
Romain Guy
am ad492161: am a2090bea: am 7118bdec: Merge "Fix for...
blob
|
commitdiff
2011-02-22
Roman Nurik
Merge "Document support for WebM/VP8 decoding." into...
blob
|
commitdiff
2011-02-18
Scott Main
Merge "docs: move new AIDL doc back into the existing...
blob
|
commitdiff
2011-02-18
Scott Main
Merge "docs: update getting started doc for 3.0; move...
blob
|
commitdiff
2011-02-18
Romain Guy
am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax...
blob
|
commitdiff
|
diff to current
2011-02-18
Robert Ly
am a58f58da: Merge "Doc change: fixing renderscript...
blob
|
commitdiff
2011-02-18
Robert Ly
Merge "Doc change: fixing renderscript samples" into...
blob
|
commitdiff
2011-02-18
Robert Ly
Doc change: fixing renderscript samples
blob
|
commitdiff
2011-02-16
Andreas Huber
am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respo...
blob
|
commitdiff
|
diff to current
2011-02-16
Scott Main
Merge "docs: update homepage for 3.0 announcement"...
blob
|
commitdiff
|
diff to current
2011-02-16
Robert Greenwalt
am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-02-16
Alon Albert
am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-02-16
daniel_tomas
am 99e267eb: am 7bcd2c62: New API added in NfcAdapter...
blob
|
commitdiff
|
diff to current
2011-02-16
Nick Pelly
am 8c8e9d9a: am 1df862a4: Minor doc update.
blob
|
commitdiff
|
diff to current
2011-02-16
Andreas Huber
am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-02-16
Robert Ly
am c3ebf27a: am 4bebbe5f: Merge "Adding package summary...
blob
|
commitdiff
|
diff to current
2011-02-15
John Wang
am 39014026: am 29853a35: Merge "Only decode EXT1 tag...
blob
|
commitdiff
|
diff to current
2011-02-15
Joe Malin
Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
blob
|
commitdiff
|
diff to current
2011-02-15
Andreas Huber
am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work...
blob
|
commitdiff
|
diff to current
2011-02-15
Scott Main
am 97ef3b41: Merge "docs: revise a couple sample app...
blob
|
commitdiff
|
diff to current
2011-02-15
Scott Main
Merge "docs: revise a couple sample app names to match...
blob
|
commitdiff
|
diff to current
2011-02-15
Scott Main
docs: revise a couple sample app names to match side nav
blob
|
commitdiff
|
diff to current
2011-02-14
Katie McCormick
Merge "Doc change: New docs for Loaders." into honeycomb
blob
|
commitdiff
|
diff to current
2011-02-14
Scott Main
Merge "add compatible-screens manifest element and...
blob
|
commitdiff
|
diff to current
2011-02-14
Scott Main
am b269346c: am d4952380: fix md5sum for windows installer
blob
|
commitdiff
|
diff to current
2011-02-12
Roman Nurik
Merge "Update Supported Media Formats document to inclu...
blob
|
commitdiff
|
diff to current
2011-02-11
Adam Cohen
am 5a1b6357: Merge "Adding StackWidget sample code...
blob
|
commitdiff
|
diff to current
2011-02-11
Adam Cohen
Merge "Adding StackWidget sample code" into honeycomb
blob
|
commitdiff
|
diff to current
2011-02-11
Winson Chung
am 5f3cd3ea: Merge "Associated changes for \'Adding...
blob
|
commitdiff
|
diff to current
2011-02-11
Winson Chung
Merge "Associated changes for 'Adding sample for collec...
blob
|
commitdiff
|
diff to current
2011-02-11
Robert Ly
resolved conflicts for merge of 810c1c0c to honeycomb...
blob
|
commitdiff
|
diff to current
2011-02-11
Robert Ly
Merge "Doc change: updating animation framework topic...
blob
|
commitdiff
|
diff to current
2011-02-11
Winson Chung
Associated changes for 'Adding sample for collection...
blob
|
commitdiff
|
diff to current
2011-02-11
Jean-Baptiste Queru
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge...
blob
|
commitdiff
|
diff to current
2011-02-11
Jean-Baptiste Queru
am 93552de8: Merge "stubs"
blob
|
commitdiff
|
diff to current
2011-02-11
Adam Cohen
Adding StackWidget sample code
blob
|
commitdiff
|
diff to current
2011-02-10
Gilles Debunne
resolved conflicts for merge of 8e28ab22 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-02-10
Wink Saville
am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony...
blob
|
commitdiff
|
diff to current
2011-02-10
Mathias Agopian
am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing...
blob
|
commitdiff
|
diff to current
2011-02-10
Scott Main
am b605869c: am 07cefd3c: add 2.3.3 announcement to...
blob
|
commitdiff
|
diff to current
2011-02-10
Jeff Hamilton
am c1cc9ba6: am 58c9d472: Merge "More documentation...
blob
|
commitdiff
|
diff to current
2011-02-10
Dirk Dougherty
am 8d56f6de: am a3f53afd: Merge "Doc change: Add versio...
blob
|
commitdiff
|
diff to current
2011-02-10
Nick Pelly
am 47dac545: am 39cf3a44: Document NFC permissions.
blob
|
commitdiff
|
diff to current
2011-02-10
Jeff Hamilton
am 1ac35411: am 584afa8d: Merge "Improve the docs a...
blob
|
commitdiff
|
diff to current
2011-02-10
Eric Fischer
am c1c31433: (-s ours) am be4b39d2: Merge "Import revis...
blob
|
commitdiff
|
diff to current
2011-02-10
Scott Main
am 129c7372: am 3c01a139: rename SIP doc title
blob
|
commitdiff
|
diff to current
2011-02-10
Scott Main
resolved conflicts for merge of 42f18194 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-02-10
Katie McCormick
resolved conflicts for merge of 690d31a6 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-02-09
Wink Saville
am 6e25789f: Merge "Telephony: Fix cb sms implementation"
blob
|
commitdiff
|
diff to current
2011-02-09
Mathias Agopian
Merge "fix [3374821] Cannot take screenshot of HC previ...
blob
|
commitdiff
|
diff to current
2011-02-09
Dirk Dougherty
am be04bfd0: am 01967c0e: Merge "Doc change: Add diff...
blob
|
commitdiff
|
diff to current
2011-02-09
Gilles Debunne
am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
blob
|
commitdiff
|
diff to current
2011-02-09
Gilles Debunne
resolved conflicts for merge of e04c1496 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-02-09
Joe Malin
Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner...
blob
|
commitdiff
|
diff to current
2011-02-08
Jason Sams
Merge "Fix bug 3421901 remove 2 functions from public...
blob
|
commitdiff
|
diff to current
2011-02-08
Eric Fischer
Merge "Import revised translations. DO NOT MERGE"...
blob
|
commitdiff
|
diff to current
2011-02-08
Roman Nurik
am 8635908d: Merge "Update resources data JSON, sample...
blob
|
commitdiff
|
diff to current
2011-02-08
Roman Nurik
Merge "Update resources data JSON, sample screenshot...
blob
|
commitdiff
|
diff to current
2011-02-08
Scott Main
am 62e97010: enable javadoc filtering for api level...
blob
|
commitdiff
|
diff to current
2011-02-08
Scott Main
enable javadoc filtering for api level 11 and disable...
blob
|
commitdiff
|
diff to current
2011-02-07
Roman Nurik
Update resources data JSON, sample screenshot, and...
blob
|
commitdiff
|
diff to current
2011-02-07
Brad Fitzpatrick
am a62bf8bb: am b901c9ab: am 9204644d: Merge "Fix a...
blob
|
commitdiff
|
diff to current
2011-02-07
Brad Fitzpatrick
am 9204644d: Merge "Fix a race condition in NativeDaemo...
blob
|
commitdiff
|
diff to current
2011-02-07
Dianne Hackborn
am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing...
blob
|
commitdiff
|
diff to current
2011-02-07
Dianne Hackborn
am bb2e1ef8: Merge "Fixing possible race condition."
blob
|
commitdiff
|
diff to current
2011-02-05
Kenny Root
am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinp...
blob
|
commitdiff
|
diff to current
2011-02-05
Kenny Root
am c94a9998: Merge "JPtextinput: Dont break emoji chara...
blob
|
commitdiff
|
diff to current
2011-02-04
Gilles Debunne
am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking...
blob
|
commitdiff
|
diff to current
2011-02-04
Gilles Debunne
am 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable...
blob
|
commitdiff
|
diff to current
2011-02-04
Gilles Debunne
am 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnF...
blob
|
commitdiff
|
diff to current
2011-02-04
Gilles Debunne
Merge "Blinking runnable is created only if text is...
blob
|
commitdiff
|
diff to current
2011-02-04
Gilles Debunne
Merge "All runnable are stopped on detach. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-02-04
Gilles Debunne
Merge "SelectAllOnFocus shows a higlighted text. DO...
blob
|
commitdiff
|
diff to current
2011-02-04
Brad Fitzpatrick
am cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initializ...
blob
|
commitdiff
|
diff to current
2011-02-04
Brad Fitzpatrick
am b083d3b8: Merge "Initialize resampling buffer per...
blob
|
commitdiff
|
diff to current
2011-02-04
Joe Onorato
am 2742c9c2: am 163c28b5: Merge "Managed dialogs should...
blob
|
commitdiff
|
diff to current
2011-02-04
Nick Pelly
am 062443f2: am 40684946: Merge "Fix docs type that...
blob
|
commitdiff
|
diff to current
2011-02-04
Jean-Baptiste Queru
am 501dbaea: am 6dbdcd55: am db71bda6: Merge from ginge...
blob
|
commitdiff
|
diff to current
2011-02-04
Scott Main
am 51768f4b: am 779f7410: Merge "cherrypick Change...
blob
|
commitdiff
|
diff to current
2011-02-04
Nick Pelly
am 5394ef06: am 630ac8df: Merge "NFC documentation...
blob
|
commitdiff
|
diff to current
2011-02-03
Jean-Baptiste Queru
am db71bda6: Merge from gingerbread
blob
|
commitdiff
|
diff to current
2011-02-03
Jean-Baptiste Queru
Merge 917d9ea1
blob
|
commitdiff
|
diff to current
2011-02-03
Jean-Baptiste Queru
Merge from open-source gingerbread
blob
|
commitdiff
|
diff to current
2011-02-03
Jean-Baptiste Queru
am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from ginge...
blob
|
commitdiff
|
diff to current
2011-02-03
Jean-Baptiste Queru
am 375afcd5: am 4b8ad9ef: Merge from gingerbread
blob
|
commitdiff
|
diff to current
2011-02-03
Jean-Baptiste Queru
am baaaca1c: Merge ee4c17ee from gingerbread
blob
|
commitdiff
|
diff to current
2011-02-03
Jean-Baptiste Queru
Merge from open-source gingerbread
blob
|
commitdiff
|
diff to current
2011-02-03
Scott Main
am 2e5fea59: am ca69a634: fix broken links, update...
blob
|
commitdiff
|
diff to current
2011-02-03
Scott Main
am 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale...
blob
|
commitdiff
|
diff to current
2011-02-03
Scott Main
am 603b475e: am 4add7f3f: cherrypick Change-Id: I350a01...
blob
|
commitdiff
|
diff to current
next