OSDN Git Service

Merge "Android OS battery usage overstated by screen on time" into ics-mr1
[android-x86/packages-apps-Settings.git] / proguard.flags
2010-10-16 Roy Westam cfcad4e4: am d3abea0d: Fix a few more cases of USB...
2010-10-16 Jaikumar Ganesham 7805fa99: am 022299df: Merge "Disconnect dock only...
2010-10-15 Kenny Rootam c915d16a: (-s ours) am b5848295: Merge "Import revis...
2010-10-15 Kenny Rootresolved conflicts for merge of 2a612605 to master
2010-10-15 Jake Hambyam 8028cea1: (-s ours) am 8021537f: BT settings wait...
2010-10-15 Nick Pellyam da08f31f: am 792d4356: Merge "Move NFC setting lower...
2010-10-15 Jaikumar Ganesham 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE...
2010-10-15 Nick Pellyam f4e4319f: am 083310d3: Update NFC settings descripti...
2010-10-15 Jaikumar Ganesham 0d5e320c: am bdf13107: Merge "Call disconnect /...
2010-10-15 Nick Pellyam b3c4365d: am cd99332f: Merge "Update settings app...
2010-10-14 Kenny Rootam 52e8542d: am 737e91ef: Merge "Don\'t show the sort...
2010-10-14 Freeman Ngresolved conflicts for merge of 59561e0a to master
2010-10-13 Roy Westam f233ec77: am 30186392: With luck, final take on...
2010-10-12 Jake Hambyam d7f7213a: am 4c0ff2c7: Merge "Fix bug where car...
2010-10-12 Irfan Sheriffam 52ad3f2f: am 566b5bb0: Improve password hint visibility
2010-10-12 Jean-Baptiste Queruam 80455f36: am b84291bb: Merge "Support showing "Cold...
2010-10-11 Roy Westam 81635077: am effdd53f: Fix bug3076083 re backup...
2010-10-10 Roy Westam 83caf0b2: (-s ours) am 82d2908b: do not merge
2010-10-10 Roy Westam 60d9b33f: (-s ours) am e3b0bda2: do not merge
2010-10-10 Eric Fischeram 5e51c769: (-s ours) am d86f58a9: Merge "Import revis...
2010-10-10 Jean-Baptiste Queruresolved conflicts for merge of 10ebf928 to master
2010-10-10 Jean-Baptiste Queruresolved conflicts for merge of 0eb550ef to master
2010-10-09 Eric Fischeram 27db062d: (-s ours) am 84c8c175: Import revised...
2010-10-07 Dianne Hackbornam 3e15e4e9: am 6dc1bf84: Manage apps "on SD card"...
2010-10-01 Eric Fischeram 25c52b70: am 340c5c42: Separate the Settings activit...
2010-10-01 Dianne Hackbornam 3cda486c: am 95d7a702: Merge "Fix android:allowClear...
2010-10-01 Eric Fischeram ddaf8f49: (-s ours) am f20931bc: Merge "Import revis...
2010-09-30 Ken Wakasaam bc692e83: am 2d6c0b0d: Update strings for physical...
2010-09-30 Gilles Debunneam 345fbf92: am a63b08d9: New assets for power widget...
2010-09-30 Gilles Debunneam a48d2dbe: am 98289826: Merge "New assets (wifi,...
2010-09-30 Eric Fischerresolved conflicts for merge of cf18672a to master
2010-09-30 Ken WakasaMerge commit '47ad0cf3' into manualmerge
2010-09-29 Nick Pellyresolved conflicts for merge of 1ff9ad3f to master
2010-09-28 Chris Palmeram e2ab4597: am 88fdee27: Merge "Improve the add-device...
2010-09-28 Winson Chungam ca76166c: am 0adb8460: Merge "Modifying the ACTION_M...
2010-09-27 Eric Fischeram 2d68f1b5: (-s ours) am 54e21852: Merge "Trim unwante...
2010-09-27 Amith Yamasaniam 38f331be: am f8093b33: Merge "Fix the indicators...
2010-09-27 Jean-Baptiste Queruam 4d34b227: (-s ours) am 32d54b19: reconcile froyo...
2010-09-26 Jean-Baptiste Queruam d3125293: am 3f1ba01d: Merge "BT: The Phone doesn...
2010-09-25 Jake Hambyam 68c6188b: am dd79a33b: Auto-connect Bluetooth device...
2010-09-24 Eric Fischeram 4cc41d87: (-s ours) am b2fa8719: Import revised...
2010-09-23 Jake Hambyam 5496db04: am 59091c08: Fix Bluetooth device name...
2010-09-21 Bjorn Bringertam e2b102de: (-s ours) am 28580b4d: Remove Search from...
2010-09-21 Dianne Hackbornam 7cad4e2c: am 3a6bb47d: Merge "Some improvements...
2010-09-20 Bjorn Bringertam 2441c93d: (-s ours) am 8fdaff05: am f4d359d3: (...
2010-09-18 Dianne Hackbornam 7222997e: am cb818619: Update power usage UI to...
2010-09-17 Jaikumar Ganesham 356745ec: am 213d579f: Merge "Don\'t disconnect...
2010-09-15 Dianne Hackbornam e2fc49ac: am 5c2a4684: Merge "Supercalifragilisticex...
2010-09-15 Brad Fitzpatrickam f8a473c3: am c5c8dad0: Use new apply() instead of...
2010-09-13 Daisuke MiyakawaFragmentize BluetoothSettings.
2010-09-13 Jaikumar Ganesham 1647d472: am e714898a: Merge "OutOfband pairing...
2010-09-11 Chung-yih Wangresolved conflicts for merge of 2af8a007 to master
2010-09-10 Jean-Baptiste Queruam 8ce1853f: am 16502e94: Merge "Allow users to create...
2010-09-10 Erik Ljungbergam 40230c14: am 33319b12: Bluetooth PIN is not password...
2010-09-10 Eric Fischeram a27ffa47: (-s ours) am be45f642: Import revised...
2010-09-07 Eric Fischeram 11bf335a: (-s ours) am 1a886f80: Merge "Preserve...
2010-09-03 Dianne Hackbornam 1cc3202d: am 2d5cd1df: Follow rename.
2010-09-03 Dianne Hackbornam 356102e3: am 02930093: Fix issue #2905454: Crash...
2010-09-02 Erik Ljungbergam 6e6d0580: am 83c3b64f: BT: The Phone doesn\'t "wake...
2010-09-01 Daisuke MiyakawaAdd Wifi Setup screen for Setup Wizard with XL size...
2010-09-01 Dianne Hackbornam 16339b6f: am 5774d5d3: Show correct process dependen...
2010-08-30 Brad Fitzpatrickam 6442f0b4: am 22aa2130: Merge "Make power control...
2010-08-30 Eric Fischeram 27521a0d: (-s ours) am 92669a51: Import revised...
2010-08-30 Daisuke MiyakawaMake LocalePicker Fragment.
2010-08-26 Daisuke MiyakawaMerge "Fragmentize WifiSettings."
2010-08-26 Jean-Michel Triviam b3d90b60: am a457719c: Add new string for the notifi...
2010-08-25 Daisuke MiyakawaFragmentize WifiSettings.
2010-08-24 Jean-Baptiste Queruam 41357ba8: am 02e731fb: merge -s ours from froyo...
2010-08-24 Kenny Rootresolved conflicts for merge of dbdbd152 to master
2010-08-23 Dianne Hackbornam 805ad7d1: am 4749fcf7: More tricksy.
2010-08-21 Jake Hambyam 2876ad62: am 2fcfb289: Merge " Fix Bluetooth...
2010-08-21 Dianne Hackbornam 4962c855: am a712c3b7: A couple small settings fixes:
2010-08-19 Eric FischerMerge "Import Romansh translations."
2010-08-19 Amith YamasaniFix proguard flags for settings.
2010-08-18 Eric Fischeram e86ec30f: (-s ours) am f8a91b53: Import revised...
2010-08-17 Ben Clarkam 8d62eb4a: am 0008d219: Refactor to remove multiple...
2010-08-16 Dianne Hackbornam 6ca1da8c: am ff3673c7: Make running services initial...
2010-08-16 Dianne Hackbornam 343158c7: am be5994d2: Some improvements to the...
2010-08-13 Daisuke MiyakawaMerge "Create LocalePickerFragment for fragmentizing...
2010-08-13 Daisuke MiyakawaCreate LocalePickerFragment for fragmentizing LocalePic...