OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
resolved conflicts for merge of 2a612605 to master
[android-x86/packages-apps-Settings.git]
/
tests
/
res
/
values-zh-rTW
/
strings.xml
2010-10-15
Kenny Root
resolved conflicts for merge of 2a612605 to master
blob
|
commitdiff
2010-10-15
Jake Hamby
am 8028cea1: (-s ours) am 8021537f: BT settings wait...
blob
|
commitdiff
2010-10-15
Nick Pelly
am da08f31f: am 792d4356: Merge "Move NFC setting lower...
blob
|
commitdiff
2010-10-15
Jaikumar Ganesh
am 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE...
blob
|
commitdiff
2010-10-15
Nick Pelly
am f4e4319f: am 083310d3: Update NFC settings descripti...
blob
|
commitdiff
2010-10-15
Jaikumar Ganesh
am 0d5e320c: am bdf13107: Merge "Call disconnect /...
blob
|
commitdiff
2010-10-15
Nick Pelly
am b3c4365d: am cd99332f: Merge "Update settings app...
blob
|
commitdiff
2010-10-14
Kenny Root
am 52e8542d: am 737e91ef: Merge "Don\'t show the sort...
blob
|
commitdiff
2010-10-14
Freeman Ng
resolved conflicts for merge of 59561e0a to master
blob
|
commitdiff
2010-10-13
Roy West
am f233ec77: am 30186392: With luck, final take on...
blob
|
commitdiff
2010-10-12
Jake Hamby
am d7f7213a: am 4c0ff2c7: Merge "Fix bug where car...
blob
|
commitdiff
2010-10-12
Irfan Sheriff
am 52ad3f2f: am 566b5bb0: Improve password hint visibility
blob
|
commitdiff
2010-10-12
Jean-Baptiste Queru
am 80455f36: am b84291bb: Merge "Support showing "Cold...
blob
|
commitdiff
2010-10-11
Roy West
am 81635077: am effdd53f: Fix bug3076083 re backup...
blob
|
commitdiff
2010-10-10
Roy West
am 83caf0b2: (-s ours) am 82d2908b: do not merge
blob
|
commitdiff
2010-10-10
Roy West
am 60d9b33f: (-s ours) am e3b0bda2: do not merge
blob
|
commitdiff
2010-10-10
Eric Fischer
am 5e51c769: (-s ours) am d86f58a9: Merge "Import revis...
blob
|
commitdiff
2010-10-10
Jean-Baptiste Queru
resolved conflicts for merge of 10ebf928 to master
blob
|
commitdiff
2010-10-10
Jean-Baptiste Queru
resolved conflicts for merge of 0eb550ef to master
blob
|
commitdiff
2010-10-09
Eric Fischer
am 27db062d: (-s ours) am 84c8c175: Import revised...
blob
|
commitdiff
2010-10-07
Dianne Hackborn
am 3e15e4e9: am 6dc1bf84: Manage apps "on SD card"...
blob
|
commitdiff
2010-10-01
Eric Fischer
am 25c52b70: am 340c5c42: Separate the Settings activit...
blob
|
commitdiff
2010-10-01
Dianne Hackborn
am 3cda486c: am 95d7a702: Merge "Fix android:allowClear...
blob
|
commitdiff
2010-10-01
Eric Fischer
am ddaf8f49: (-s ours) am f20931bc: Merge "Import revis...
blob
|
commitdiff
2010-09-30
Ken Wakasa
am bc692e83: am 2d6c0b0d: Update strings for physical...
blob
|
commitdiff
2010-09-30
Gilles Debunne
am 345fbf92: am a63b08d9: New assets for power widget...
blob
|
commitdiff
2010-09-30
Gilles Debunne
am a48d2dbe: am 98289826: Merge "New assets (wifi,...
blob
|
commitdiff
2010-09-30
Eric Fischer
resolved conflicts for merge of cf18672a to master
blob
|
commitdiff
2010-09-30
Ken Wakasa
Merge commit '47ad0cf3' into manualmerge
blob
|
commitdiff
2010-09-29
Nick Pelly
resolved conflicts for merge of 1ff9ad3f to master
blob
|
commitdiff
2010-09-28
Chris Palmer
am e2ab4597: am 88fdee27: Merge "Improve the add-device...
blob
|
commitdiff
2010-09-28
Winson Chung
am ca76166c: am 0adb8460: Merge "Modifying the ACTION_M...
blob
|
commitdiff
2010-09-27
Eric Fischer
am 2d68f1b5: (-s ours) am 54e21852: Merge "Trim unwante...
blob
|
commitdiff
2010-09-27
Amith Yamasani
am 38f331be: am f8093b33: Merge "Fix the indicators...
blob
|
commitdiff
2010-09-27
Jean-Baptiste Queru
am 4d34b227: (-s ours) am 32d54b19: reconcile froyo...
blob
|
commitdiff
2010-09-26
Jean-Baptiste Queru
am d3125293: am 3f1ba01d: Merge "BT: The Phone doesn...
blob
|
commitdiff
2010-09-25
Jake Hamby
am 68c6188b: am dd79a33b: Auto-connect Bluetooth device...
blob
|
commitdiff
2010-09-24
Eric Fischer
am 4cc41d87: (-s ours) am b2fa8719: Import revised...
blob
|
commitdiff
2010-09-23
Jake Hamby
am 5496db04: am 59091c08: Fix Bluetooth device name...
blob
|
commitdiff
2010-09-21
Bjorn Bringert
am e2b102de: (-s ours) am 28580b4d: Remove Search from...
blob
|
commitdiff
2010-09-21
Dianne Hackborn
am 7cad4e2c: am 3a6bb47d: Merge "Some improvements...
blob
|
commitdiff
2010-09-20
Bjorn Bringert
am 2441c93d: (-s ours) am 8fdaff05: am f4d359d3: (...
blob
|
commitdiff
2010-09-18
Dianne Hackborn
am 7222997e: am cb818619: Update power usage UI to...
blob
|
commitdiff
2010-09-17
Jaikumar Ganesh
am 356745ec: am 213d579f: Merge "Don\'t disconnect...
blob
|
commitdiff
2010-09-15
Dianne Hackborn
am e2fc49ac: am 5c2a4684: Merge "Supercalifragilisticex...
blob
|
commitdiff
2010-09-15
Brad Fitzpatrick
am f8a473c3: am c5c8dad0: Use new apply() instead of...
blob
|
commitdiff
2010-09-13
Jaikumar Ganesh
am 1647d472: am e714898a: Merge "OutOfband pairing...
blob
|
commitdiff
2010-09-11
Chung-yih Wang
resolved conflicts for merge of 2af8a007 to master
blob
|
commitdiff
2010-09-10
Jean-Baptiste Queru
am 8ce1853f: am 16502e94: Merge "Allow users to create...
blob
|
commitdiff
2010-09-10
Erik Ljungberg
am 40230c14: am 33319b12: Bluetooth PIN is not password...
blob
|
commitdiff
2010-09-10
Eric Fischer
am a27ffa47: (-s ours) am be45f642: Import revised...
blob
|
commitdiff
2010-09-07
Eric Fischer
am 11bf335a: (-s ours) am 1a886f80: Merge "Preserve...
blob
|
commitdiff
2010-09-03
Dianne Hackborn
am 1cc3202d: am 2d5cd1df: Follow rename.
blob
|
commitdiff
2010-09-03
Dianne Hackborn
am 356102e3: am 02930093: Fix issue #2905454: Crash...
blob
|
commitdiff
2010-09-02
Erik Ljungberg
am 6e6d0580: am 83c3b64f: BT: The Phone doesn\'t "wake...
blob
|
commitdiff
2010-09-01
Dianne Hackborn
am 16339b6f: am 5774d5d3: Show correct process dependen...
blob
|
commitdiff
2010-08-30
Brad Fitzpatrick
am 6442f0b4: am 22aa2130: Merge "Make power control...
blob
|
commitdiff
2010-08-30
Eric Fischer
am 27521a0d: (-s ours) am 92669a51: Import revised...
blob
|
commitdiff
2010-08-26
Jean-Michel Trivi
am b3d90b60: am a457719c: Add new string for the notifi...
blob
|
commitdiff
2010-08-24
Jean-Baptiste Queru
am 41357ba8: am 02e731fb: merge -s ours from froyo...
blob
|
commitdiff
2010-08-24
Kenny Root
resolved conflicts for merge of dbdbd152 to master
blob
|
commitdiff
2010-08-23
Dianne Hackborn
am 805ad7d1: am 4749fcf7: More tricksy.
blob
|
commitdiff
2010-08-21
Jake Hamby
am 2876ad62: am 2fcfb289: Merge " Fix Bluetooth...
blob
|
commitdiff
2010-08-21
Dianne Hackborn
am 4962c855: am a712c3b7: A couple small settings fixes:
blob
|
commitdiff
2010-08-18
Eric Fischer
am e86ec30f: (-s ours) am f8a91b53: Import revised...
blob
|
commitdiff
2010-08-17
Ben Clark
am 8d62eb4a: am 0008d219: Refactor to remove multiple...
blob
|
commitdiff
2010-08-16
Dianne Hackborn
am 6ca1da8c: am ff3673c7: Make running services initial...
blob
|
commitdiff
2010-08-16
Dianne Hackborn
am 343158c7: am be5994d2: Some improvements to the...
blob
|
commitdiff
2010-08-12
Jean-Baptiste Queru
am f9cfab20: Fix build - add missing import
blob
|
commitdiff
2010-08-12
Dianne Hackborn
am 0e404872: am 36735462: More version info.
blob
|
commitdiff
2010-08-10
Eric Fischer
Merge "Import revised translations."
blob
|
commitdiff
2010-08-10
Eric Fischer
Import revised translations.
blob
|
commitdiff
2010-08-10
Eric Fischer
am cd361907: (-s ours) am 38f15782: Import revised...
blob
|
commitdiff
|
diff to current
2010-08-05
Eric Fischer
Import revised translations.
blob
|
commitdiff
|
diff to current
2010-06-15
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-06-14
The Android Open...
ignore from open-source master
blob
|
commitdiff
|
diff to current
2010-06-14
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-06-14
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-06-11
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-05-19
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-05-19
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-05-12
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-05-12
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-04-21
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-03-18
David Brown
Merge "Fix 2520977: NPE in com.android.settings.devicei...
blob
|
commitdiff
|
diff to current
2010-03-18
Eric Fischer
Merge "Import revised translations"
blob
|
commitdiff
|
diff to current
2010-03-18
Kenny Root
Import revised translations
blob
|
commitdiff
|
diff to current
2010-03-04
Eric Fischer
Merge "Import new translations"
blob
|
commitdiff
|
diff to current
2010-03-04
Eric Fischer
Import new translations
blob
|
commitdiff
|
diff to current
2010-03-02
Daniel Sandler
Merge "Support new vibrate/silent behavior."
blob
|
commitdiff
|
diff to current
2010-02-27
Jacek Surazski
Merge "Send battery reports using ApplicationErrorRepor...
blob
|
commitdiff
|
diff to current
2010-02-27
Eric Fischer
Import new translations.
blob
|
commitdiff
|
diff to current
2010-01-12
The Android Open...
android-2.1_r1 snapshot
blob
|
commitdiff
|
diff to current
2010-01-08
Amith Yamasani
Merge "Don't allow monkey to play with SIM lock setting...
blob
|
commitdiff
|
diff to current
2010-01-08
Eric Fischer
Update with latest translations.
blob
|
commitdiff
|
diff to current
2010-01-06
Michael Chan
am d638a7cb: am 04e32ff3: Merge "b/2335545 Revert the...
blob
|
commitdiff
2010-01-06
Ying Wang
am 759f48ba: am a718832e: Still use ro.monkey
blob
|
commitdiff
2010-01-04
Ying Wang
am e0415214: am 50cb76f5: Rename ro.monkey to monkey...
blob
|
commitdiff
2009-12-21
Michael Chan
am f4ec356d: am d8eec52a: b/2318290 connect should...
blob
|
commitdiff
2009-12-17
Michael Chan
am eea5133f: am c0a606d2: b/2334482 Revert white spaces
blob
|
commitdiff
next