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
resolved conflicts for merge of 5476cfee to jb-mr1-dev
[android-x86/frameworks-base.git]
/
data
/
sounds
/
notifications
/
vega.ogg
2011-01-07
Gloria Wang
Merge "DRM Framework bug fixes."
blob
|
commitdiff
2010-12-13
Jean-Baptiste Queru
resolved conflicts for merge of 4b94c451 to stage-korg...
blob
|
commitdiff
2010-12-09
Wink Saville
am 19b23afa: Merge "Fix for phone app crash in Icc...
blob
|
commitdiff
2010-12-09
Wink Saville
am 7f7474dd: Merge "frameworks/base/telephony: Release...
blob
|
commitdiff
2010-12-08
Wink Saville
am 2b858cae: Merge "Telephony: Add support to read...
blob
|
commitdiff
2010-12-07
Jean-Baptiste Queru
resolved conflicts for merge of 78742e01 to stage-korg...
blob
|
commitdiff
2010-12-06
Jean-Baptiste Queru
am 1d67fa5b: Merge "Changing connect and response timeout."
blob
|
commitdiff
2010-12-06
Jean-Baptiste Queru
am 864b1e00: Merge "NumberPicker: Set formatter local...
blob
|
commitdiff
2010-12-02
Jean-Baptiste Queru
resolved conflicts for merge of bf1439c5 to stage-korg...
blob
|
commitdiff
2010-12-02
Jean-Baptiste Queru
Merge from open-source master
blob
|
commitdiff
2010-12-02
Jean-Baptiste Queru
Merge from open-source master
blob
|
commitdiff
2010-12-01
Scott Main
am a45d6937: docs: dashboard update
blob
|
commitdiff
2010-11-30
Hung-ying Tyan
Merge "Notify SipSessions before closing SIP stack...
blob
|
commitdiff
2010-11-30
Guang Zhu
Merge "pass layout test list using external file"
blob
|
commitdiff
2010-11-29
Olivier Bailly
Merge "fix int vs. pointer mismatch in return statement...
blob
|
commitdiff
2010-11-24
Gilles Debunne
Merge "Assets moved from drawable to drawable-mdpi...
blob
|
commitdiff
2010-11-24
Jaikumar Ganesh
Merge "Update BT code for voice capability cases."
blob
|
commitdiff
2010-11-24
Scott Main
am 3577f51d: docs: clarify <include> layout properties...
blob
|
commitdiff
2010-11-24
Wink Saville
Merge "Promote ApnSetting to com.android.internal.telep...
blob
|
commitdiff
2010-11-24
Steve Block
Merge "Skip LayoutTest http/tests/cookies/third-party...
blob
|
commitdiff
2010-11-24
Vasu Nori
Merge "changes to support Change-Id: I572fdfd6d34dbb5a0...
blob
|
commitdiff
2010-11-24
Jeff Brown
Merge "Fix build on Linux due to different strrchr...
blob
|
commitdiff
2010-11-23
Jeff Brown
Merge "Port Emulator keymaps."
blob
|
commitdiff
2010-11-23
Irfan Sheriff
Merge "Fix Wifi's setting of isAvailable."
blob
|
commitdiff
2010-11-23
Jean-Baptiste Queru
am f0f6c54b: Merge "frameworks/base: Destroy the overla...
blob
|
commitdiff
2010-11-23
Vasu Nori
Merge "print certain rows from downloads.db when bugrep...
blob
|
commitdiff
2010-11-23
The Android Automerger
Merge branch 'master' into honeycomb-release
blob
|
commitdiff
2010-11-23
Kenny Root
Merge "Add knowledge of mipmap to aapt"
blob
|
commitdiff
2010-11-23
Gloria Wang
am 4da48ec8: Merge "Notify the playback status to DRM...
blob
|
commitdiff
2010-11-23
Gloria Wang
am d9334934: Merge "Update of DRM Framework."
blob
|
commitdiff
2010-11-23
Gil Dobjanschi
Merge "Begin transition was invalidated when the image...
blob
|
commitdiff
2010-11-23
Jean-Baptiste Queru
resolved conflicts for merge of e4ae7fc3 to gingerbread...
blob
|
commitdiff
2010-11-23
Joe Onorato
Merge "Add a better notification test and clean up...
blob
|
commitdiff
2010-11-23
Jason Sams
Merge "More error checks"
blob
|
commitdiff
2010-11-23
Justin Ho
Merge "Merging some Gingerbread status bar icons to...
blob
|
commitdiff
2010-11-22
Andreas Huber
Merge "Squashed commit of the following:"
blob
|
commitdiff
2010-11-22
Justin Ho
Merge "Adding new gingerbread notifications and rington...
blob
|
commitdiff
2010-11-22
Xia Wang
am 6bdd6937: am 5df8c155: Merge "Add Wifi Tethering...
blob
|
commitdiff
2010-11-22
Scott Main
am 4f3c40cc: am 8fac7c2e: change sdk version variable...
blob
|
commitdiff
2010-11-22
Jean-Baptiste Queru
am c8454a85: am b2b0db2d: Merge "SearchDialog: Fix...
blob
|
commitdiff
2010-11-22
Jean-Baptiste Queru
am b2b0db2d: Merge "SearchDialog: Fix for NullpointerEx...
blob
|
commitdiff
2010-11-22
Justin Ho
Adding new gingerbread notifications and ringtones...
blob
|
commitdiff
2010-11-20
Dirk Dougherty
am e489d48f: am 805bddc1: Merge "doc change: Docs for...
blob
|
commitdiff
2010-11-20
Wu-cheng Li
am fb6f4505: am 589e8381: Merge "Improve camera documen...
blob
|
commitdiff
2010-11-20
Mathias Agopian
am d3b5510b: am 927e7410: Merge "Fix SensorManager...
blob
|
commitdiff
2010-11-20
Scott Main
am 55ff5708: am 828b6816: Merge "docs: add docs for...
blob
|
commitdiff
2010-11-20
Jean-Baptiste Queru
am 716f60ce: resolved conflicts for merge of e2ec61b2...
blob
|
commitdiff
2010-11-20
Jean-Baptiste Queru
am 7b76ed69: am e3bef7c4: Merge "Added noop unregisterR...
blob
|
commitdiff
2010-11-20
Jean-Baptiste Queru
resolved conflicts for merge of e2ec61b2 to gingerbread...
blob
|
commitdiff
2010-11-19
Jean-Baptiste Queru
am e3bef7c4: Merge "Added noop unregisterReceiver to...
blob
|
commitdiff
2010-11-19
Dirk Dougherty
am 00f502a3: am 0e29064d: Merge "Doc change: update...
blob
|
commitdiff
2010-11-19
Brad Fitzpatrick
am 096c4c44: am 251384a7: Merge "Improve performance...
blob
|
commitdiff
2010-11-19
Jean-Baptiste Queru
am f69f356e: am 14ac9546: Merge "build failed with...
blob
|
commitdiff
2010-11-19
Brad Fitzpatrick
am 251384a7: Merge "Improve performance when getting...
blob
|
commitdiff
2010-11-19
Jean-Baptiste Queru
am 14ac9546: Merge "build failed with g++ v. 4.4.5...
blob
|
commitdiff
2010-11-18
Mathias Agopian
am 550b1e17: am 671a6ff4: Add support for virtual sensors.
blob
|
commitdiff
2010-11-18
Justin Ho
am 5e5c2a19: (-s ours) am 80381ab4: Merge "DO NOT MERGE...
blob
|
commitdiff
2010-11-18
Jeff Brown
am bed67e99: (-s ours) am b27b8c0c: Fix a key repeating...
blob
|
commitdiff
2010-11-18
Jeff Brown
am a4846be1: (-s ours) am bfc1cc2d: Fix stuck keys...
blob
|
commitdiff
2010-11-18
Scott Main
am 705c179e: am 0fe33a48: am 2cbe92ea: docs: add better...
blob
|
commitdiff
2010-11-18
Scott Main
am 2cbe92ea: docs: add better visibility to app install...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 977d01f3: am 27c06bab: Merge "Release reference...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 27c06bab: Merge "Release reference when putting...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 74923d3a: am d34c1495: Merge "Prevent system crash...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 218e0033: am 11dba787: Merge "Fix build (broken...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am d34c1495: Merge "Prevent system crash when OOM in...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 11dba787: Merge "Fix build (broken documentation...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 5e069074: am a15e4886: Merge "Framebuffer: Support...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
resolved conflicts for merge of 1a2344b8 to master
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am a15e4886: Merge "Framebuffer: Support variable numbe...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 09e50cdb: Merge "Reorder lock acquision vs try."
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
am 7ee42771: Merge "resolved conflicts for merge of...
blob
|
commitdiff
2010-11-18
Jean-Baptiste Queru
resolved conflicts for merge of 8fc378f9 to gingerbread...
blob
|
commitdiff
2010-11-18
Dirk Dougherty
am 31c5f68d: am fc1f5e24: doc change: update uses-featu...
blob
|
commitdiff
2010-11-17
Dianne Hackborn
am d28dc3cf: (-s ours) am 05434e9f: Final API 9. Reall...
blob
|
commitdiff
2010-11-16
Brad Fitzpatrick
am 8443dd16: am 383e95e2: Merge "DropBox: Read until...
blob
|
commitdiff
2010-11-16
Brad Fitzpatrick
am 383e95e2: Merge "DropBox: Read until the end of...
blob
|
commitdiff
2010-11-16
Xia Wang
am f55c9736: am d0a8f54a: Merge "Add Wi-Fi connection...
blob
|
commitdiff
2010-11-15
Mathias Agopian
am f11bf284: am 305bc0fe: Merge "Fix a race condition...
blob
|
commitdiff
2010-11-15
Mathias Agopian
am 99866c11: am 9e291a4b: Merge "Revert "allow all...
blob
|
commitdiff
2010-11-15
Justin Ho
am b9d3e359: (-s ours) am 868889fb: Merge "DO NOT MERGE...
blob
|
commitdiff
2010-11-15
Justin Ho
am dc04f537: (-s ours) am a5c4aeba: Merge "DO NOT MERGE...
blob
|
commitdiff
2010-11-13
Megha Joshi
am 7bcccece: (-s ours) am e2ef2c10: Fixing build (DO...
blob
|
commitdiff
2010-11-13
Megha Joshi
am 7e059716: (-s ours) am 48c698fc: Adding NFC sample...
blob
|
commitdiff
2010-11-12
Scott Main
am 16555c60: am d6b9d078: Merge "docs: misc changes...
blob
|
commitdiff
2010-11-11
Eric Fischer
am 9acf04ab: (-s ours) am 3082e5fe: Merge "Import revis...
blob
|
commitdiff
2010-11-11
Mathias Agopian
am 792b847e: am fcab475c: Merge "record the last event...
blob
|
commitdiff
2010-11-11
Scott Main
am 93896ad8: am dfb12218: docs: revise adding component...
blob
|
commitdiff
2010-11-11
Amith Yamasani
am f8d2aff4: am db65907a: Merge "Adding pan behavior...
blob
|
commitdiff
2010-11-11
Amith Yamasani
am db65907a: Merge "Adding pan behavior on preference...
blob
|
commitdiff
2010-11-11
John Wang
am 1ed7d65b: am fac4a689: Merge "Fix the audio mode...
blob
|
commitdiff
2010-11-11
Dianne Hackborn
am 63f40387: am 34594e75: Merge "Fix issue #3177284...
blob
|
commitdiff
2010-11-11
Jeff Brown
am 5314335c: (-s ours) am 00e5dd44: Merge "Fix JNI...
blob
|
commitdiff
2010-11-10
Scott Main
am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts...
blob
|
commitdiff
2010-11-10
Scott Main
resolved conflicts for merge of 5a726729 to gingerbread
blob
|
commitdiff
2010-11-10
Mathias Agopian
am d6c7893d: (-s ours) am 17fd21fc: Merge "DO NOT MERGE...
blob
|
commitdiff
2010-11-10
Brad Fitzpatrick
am bf44ebae: am 9de93424: Merge "Without SD card the...
blob
|
commitdiff
2010-11-10
Brad Fitzpatrick
am 9de93424: Merge "Without SD card the shutdown sequen...
blob
|
commitdiff
2010-11-10
Scott Main
am 12a22635: am f4724cdd: Merge "docs: update eclipse...
blob
|
commitdiff
2010-11-10
Owen Lin
am 8ffb135d: am 45ca778d: Merge "Make sure the controll...
blob
|
commitdiff
next