OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
add back 'Never Timeout' to Screen timeout of Display settings
[android-x86/packages-apps-Settings.git] / Android.mk
2011-03-10 TK MUNam f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX... blob | commitdiff
2011-03-04 Lorenzo Colittiresolved conflicts for merge of a4fb8c86 to honeycomb... blob | commitdiff
2011-03-03 Mike Lockwoodam 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta... blob | commitdiff
2011-02-22 Eric Fischeram 058f62ba: (-s ours) am bd044818: Import revised... blob | commitdiff
2011-02-11 Amith Yamasaniam 255fa0e9: (-s ours) am aae04e43: Prevent monkeys... blob | commitdiff
2011-02-10 Eric Fischeram d422079a: (-s ours) am 47d2ecd0: Import revised... blob | commitdiff
2011-02-05 Jake Hambyam 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a... blob | commitdiff
2011-02-01 Eric Fischeram 2b78f433: (-s ours) am 93580e22: Import revised... blob | commitdiff
2011-01-29 Eric Fischeram 5a2bb8c0: (-s ours) Import revised translations... blob | commitdiff
2011-01-29 Eric Fischeram 95112e5b: (-s ours) Import revised translations... blob | commitdiff
2011-01-29 Eric Fischeram abdfaed8: (-s ours) am 5a2bb8c0: Import revised... blob | commitdiff
2011-01-29 Eric Fischeram 0cd5e21a: (-s ours) am 95112e5b: Import revised... blob | commitdiff
2011-01-25 Eric Fischeram 6418d373: (-s ours) Import translations for addition... blob | commitdiff
2011-01-18 Amith Yamasaniam 2768ae05: am f7fd4ca8: Merge "Disable change PIN... blob | commitdiff
2011-01-08 Eric Fischeram 40bcf565: (-s ours) am 6418d373: Import translations... blob | commitdiff
2010-12-28 Jean-Baptiste Queruam 9a10fb0b: am e8531ff6: Merge "Changed the text input... blob | commitdiff
2010-12-13 Nick Pellyam 934c1b9f: am c1286804: Merge "Update Settings for... blob | commitdiff
2010-12-10 Eric Fischeram 5721cb1d: (-s ours) am 99d2471d: Import revised... blob | commitdiff
2010-12-10 Jean-Baptiste Queruam 9b9c61f6: am 2a7c5425: reconcile with open-source... blob | commitdiff
2010-12-09 Jean-Baptiste Queruam bd73c736: (-s ours) am 1acfef82: merge from gingerbread blob | commitdiff
2010-12-06 Jake Hambyam 90b1f193: (-s ours) am b0fda6f5: Reduce max BT devic... blob | commitdiff
2010-12-02 Irfan Sheriffam ea04ee75: (-s ours) am fa04d89f: avoid view creation... blob | commitdiff
2010-12-01 Eric Fischeram 39f8dba1: (-s ours) am e1e257f4: Import revised... blob | commitdiff
2010-11-30 Jean-Baptiste Queruam b68b35dd: am 04b646df: Merge "Possible NumberFormatE... blob | commitdiff
2010-11-11 Eric Fischeram 71d43248: (-s ours) am 5c205262: Merge "Import revis... blob | commitdiff
2010-11-11 Dianne Hackbornam 969773aa: am 83d2698f: Merge "Fix issue #3177284... blob | commitdiff
2010-11-04 Nick Pellyam b93b018a: am 91ba0709: Update settings text on succe... blob | commitdiff
2010-10-29 Dianne Hackbornam 5f301797: am 4e4ed14e: Fix issue #3146784: ANR in... blob | commitdiff
2010-10-26 Jean-Baptiste Queruam 28539897: am 8815f032: Merge "Always set right auth_... blob | commitdiff
2010-10-25 Eric Fischeram c26cfa35: (-s ours) am 873a27c3: Import revised... blob | commitdiff
2010-10-22 Eric Fischeram 0b655575: (-s ours) am 901f4fbe: Merge "Import revis... blob | commitdiff
2010-10-22 Dianne Hackbornam 8731cb1b: am 5e34f239: Fix issue #3124528: Mange... blob | commitdiff
2010-10-22 Eric Fischerresolved conflicts for merge of 92acdba0 to master blob | commitdiff
2010-10-22 Roy Westam d2927990: (-s ours) am 69827524: Try to fix bug31193... blob | commitdiff
2010-10-22 Jean-Baptiste QueruMerge from gingerbread-plus-aosp blob | commitdiff
2010-10-21 Nick Pellyam 26d6e470: am 781c0aa2: Merge "NFC Settings cleanup... blob | commitdiff
2010-10-21 Dianne Hackbornam 149fec6a: am 7a519955: Merge "Fix issue #3114356... blob | commitdiff
2010-10-21 Nick Pellyam 029f23c3: am ff8018dc: Merge "Fix NFC permission... blob | commitdiff
2010-10-21 Dianne Hackbornam 5cfa7587: am 916adce0: Fix issue #3108683: GRH18... blob | commitdiff
2010-10-19 Brad Fitzpatrickam 4036e768: am d36d650a: NFC: async enabling/disabling... blob | commitdiff
2010-10-19 Brad Fitzpatrickam 17001cea: NFC: async enabling/disabling, ala Bluewoo... blob | commitdiff
2010-10-19 Roy Westresolved conflicts for merge of 98f3aff3 to master blob | commitdiff
2010-10-18 Dan MorrillMerge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841... blob | commitdiff
2010-10-18 Dan MorrillMerge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8... blob | commitdiff
2010-10-18 Kenny Rootam ea86bcd1: (-s ours) am 3594b1b7: Import revised... blob | commitdiff
2010-10-17 Nick Pellyam fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefa... blob | commitdiff
2010-10-16 Amith Yamasaniam 8de45a66: am 1bdb7874: Make summary appear for both... blob | commitdiff
2010-10-16 Roy Westam d3c1749b: am 2c489973: Change USB tab to USB storage... blob | commitdiff
2010-10-16 Roy Westam cfcad4e4: am d3abea0d: Fix a few more cases of USB... blob | commitdiff
2010-10-16 Jaikumar Ganesham 7805fa99: am 022299df: Merge "Disconnect dock only... blob | commitdiff
2010-10-15 Kenny Rootam c915d16a: (-s ours) am b5848295: Merge "Import revis... blob | commitdiff
2010-10-15 Kenny Rootresolved conflicts for merge of 2a612605 to master blob | commitdiff
2010-10-15 Jake Hambyam 8028cea1: (-s ours) am 8021537f: BT settings wait... blob | commitdiff
2010-10-15 Nick Pellyam da08f31f: am 792d4356: Merge "Move NFC setting lower... blob | commitdiff
2010-10-15 Jaikumar Ganesham 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE... blob | commitdiff
2010-10-15 Nick Pellyam f4e4319f: am 083310d3: Update NFC settings descripti... blob | commitdiff
2010-10-15 Jaikumar Ganesham 0d5e320c: am bdf13107: Merge "Call disconnect /... blob | commitdiff
2010-10-15 Nick Pellyam b3c4365d: am cd99332f: Merge "Update settings app... blob | commitdiff
2010-10-14 Kenny Rootam 52e8542d: am 737e91ef: Merge "Don\'t show the sort... blob | commitdiff
2010-10-14 Freeman Ngresolved conflicts for merge of 59561e0a to master blob | commitdiff
2010-10-13 Roy Westam f233ec77: am 30186392: With luck, final take on... blob | commitdiff
2010-10-12 Jake Hambyam d7f7213a: am 4c0ff2c7: Merge "Fix bug where car... blob | commitdiff
2010-10-12 Irfan Sheriffam 52ad3f2f: am 566b5bb0: Improve password hint visibility blob | commitdiff
2010-10-12 Jean-Baptiste Queruam 80455f36: am b84291bb: Merge "Support showing "Cold... blob | commitdiff
2010-10-11 Roy Westam 81635077: am effdd53f: Fix bug3076083 re backup... blob | commitdiff
2010-10-10 Roy Westam 83caf0b2: (-s ours) am 82d2908b: do not merge blob | commitdiff
2010-10-10 Roy Westam 60d9b33f: (-s ours) am e3b0bda2: do not merge blob | commitdiff
2010-10-10 Eric Fischeram 5e51c769: (-s ours) am d86f58a9: Merge "Import revis... blob | commitdiff
2010-10-10 Jean-Baptiste Queruresolved conflicts for merge of 10ebf928 to master blob | commitdiff
2010-10-10 Jean-Baptiste Queruresolved conflicts for merge of 0eb550ef to master blob | commitdiff
2010-10-09 Eric Fischeram 27db062d: (-s ours) am 84c8c175: Import revised... blob | commitdiff
2010-10-07 Dianne Hackbornam 3e15e4e9: am 6dc1bf84: Manage apps "on SD card"... blob | commitdiff
2010-10-05 Amith YamasaniMerge "3053971 Accessibility settings are not using... blob | commitdiff
2010-10-01 Eric Fischeram 25c52b70: am 340c5c42: Separate the Settings activit... blob | commitdiff
2010-10-01 Dianne Hackbornam 3cda486c: am 95d7a702: Merge "Fix android:allowClear... blob | commitdiff
2010-10-01 Eric Fischeram ddaf8f49: (-s ours) am f20931bc: Merge "Import revis... blob | commitdiff
2010-09-30 Ying WangFix proguard flag file dependency. blob | commitdiff
2010-09-30 Ken Wakasaam bc692e83: am 2d6c0b0d: Update strings for physical... blob | commitdiff | diff to current
2010-09-30 Gilles Debunneam 345fbf92: am a63b08d9: New assets for power widget... blob | commitdiff | diff to current
2010-09-30 Gilles Debunneam a48d2dbe: am 98289826: Merge "New assets (wifi,... blob | commitdiff | diff to current
2010-09-30 Eric Fischerresolved conflicts for merge of cf18672a to master blob | commitdiff | diff to current
2010-09-30 Ken WakasaMerge commit '47ad0cf3' into manualmerge blob | commitdiff | diff to current
2010-09-29 Nick Pellyresolved conflicts for merge of 1ff9ad3f to master blob | commitdiff | diff to current
2010-09-28 Chris Palmeram e2ab4597: am 88fdee27: Merge "Improve the add-device... blob | commitdiff | diff to current
2010-09-28 Winson Chungam ca76166c: am 0adb8460: Merge "Modifying the ACTION_M... blob | commitdiff | diff to current
2010-09-27 Eric Fischeram 2d68f1b5: (-s ours) am 54e21852: Merge "Trim unwante... blob | commitdiff | diff to current
2010-09-27 Amith Yamasaniam 38f331be: am f8093b33: Merge "Fix the indicators... blob | commitdiff | diff to current
2010-09-27 Jean-Baptiste Queruam 4d34b227: (-s ours) am 32d54b19: reconcile froyo... blob | commitdiff | diff to current
2010-09-26 Jean-Baptiste Queruam d3125293: am 3f1ba01d: Merge "BT: The Phone doesn... blob | commitdiff | diff to current
2010-09-25 Jake Hambyam 68c6188b: am dd79a33b: Auto-connect Bluetooth device... blob | commitdiff | diff to current
2010-09-24 Eric Fischeram 4cc41d87: (-s ours) am b2fa8719: Import revised... blob | commitdiff | diff to current
2010-09-23 Jake Hambyam 5496db04: am 59091c08: Fix Bluetooth device name... blob | commitdiff | diff to current
2010-09-21 Bjorn Bringertam e2b102de: (-s ours) am 28580b4d: Remove Search from... blob | commitdiff | diff to current
2010-09-21 Dianne Hackbornam 7cad4e2c: am 3a6bb47d: Merge "Some improvements... blob | commitdiff | diff to current
2010-09-20 Bjorn Bringertam 2441c93d: (-s ours) am 8fdaff05: am f4d359d3: (... blob | commitdiff | diff to current
2010-09-18 Dianne Hackbornam 7222997e: am cb818619: Update power usage UI to... blob | commitdiff | diff to current
2010-09-17 Jaikumar Ganesham 356745ec: am 213d579f: Merge "Don\'t disconnect... blob | commitdiff | diff to current
2010-09-15 Dianne Hackbornam e2fc49ac: am 5c2a4684: Merge "Supercalifragilisticex... blob | commitdiff | diff to current
2010-09-15 Brad Fitzpatrickam f8a473c3: am c5c8dad0: Use new apply() instead of... blob | commitdiff | diff to current
2010-09-13 Jaikumar Ganesham 1647d472: am e714898a: Merge "OutOfband pairing... blob | commitdiff | diff to current
next
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help