OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
am a6daa21d: (-s ours) am 015788ca: Merge "Import translations for cherry-picked...
[android-x86/packages-apps-Settings.git] / src / com / android / settings / vpn /
2011-06-07 Jaikumar Ganesham a6daa21d: (-s ours) am 015788ca: Merge "Import trans... tree | commitdiff
2011-06-07 Jaikumar Ganesham bd34e568: (-s ours) am eddb21a2: Merge "Changes... tree | commitdiff
2011-06-07 Jaikumar Ganesham aeca1851: (-s ours) am c955d8ee: Merge "Allow users... tree | commitdiff
2011-06-06 Marco Nelissenresolved conflicts for merge of 531bed61 to honeycomb... tree | commitdiff
2011-05-27 Jaikumar Ganesham 015788ca: Merge "Import translations for cherry... tree | commitdiff
2011-05-27 Jaikumar Ganesham eddb21a2: Merge "Changes for API of Bluetooth Discov... tree | commitdiff
2011-05-27 Jaikumar Ganesham c955d8ee: Merge "Allow users to change the length... tree | commitdiff
2011-05-26 sy310.choiam 95364e4a: Allow alternate string to be used for... tree | commitdiff
2011-04-28 Eric Fischeram 643e48b7: (-s ours) am 7c284c2c: Import revised... tree | commitdiff
2011-04-27 Eric Fischeram 7c284c2c: Import revised translations. DO NOT MERGE tree | commitdiff
2011-04-27 Conley OwensIgnoring empty list test in favor of commented out... tree | commitdiff
2011-04-14 Eric Fischeram 4ba98d53: (-s ours) Import revised translations... tree | commitdiff
2011-04-12 Simon Wilsonam f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif... tree | commitdiff
2011-04-11 Eric Fischeram 84c90053: (-s ours) am fcb089c9: Merge "Reimport... tree | commitdiff
2011-04-11 Simon Wilsonam 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE... tree | commitdiff
2011-04-11 Eric Fischeram 6735ae14: (-s ours) am b4bd78f5: Revert "Import... tree | commitdiff
2011-04-11 Simon Wilsonam 37063d6a: DO NOT MERGE Clarify additional system... tree | commitdiff
2011-04-05 Eric Fischeram dfb78827: (-s ours) am 955ab98f: Import revised... tree | commitdiff
2011-04-04 Eric Fischeram fcb089c9: Merge "Reimport Settings translations... tree | commitdiff
2011-04-04 Simon Wilsonam ca572fb6: Merge "DO NOT MERGE Put additional update... tree | commitdiff
2011-04-04 Eric Fischeram b4bd78f5: Revert "Import revised translations. ... tree | commitdiff
2011-04-04 Eric Fischeram 955ab98f: Import revised translations. DO NOT MERGE tree | commitdiff
2011-03-30 Park Sanghyunam 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add... tree | commitdiff
2011-03-30 Kenny Rootresolved conflicts for merge of 70a1ff03 to honeycomb... tree | commitdiff
2011-03-30 Park Sanghyunam e5da8565: DO NOT MERGE Add support for additional... tree | commitdiff
2011-03-29 Eric Fischeram 429687b9: (-s ours) Import revised translations... tree | commitdiff
2011-03-18 Eric Fischeram 9567622d: (-s ours) am c4eeeb29: Import revised... tree | commitdiff
2011-03-18 Eric Fischeram c4eeeb29: Import revised translations. DO NOT MERGE tree | commitdiff
2011-03-17 TK MUNam 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do... tree | commitdiff
2011-03-17 TK MUNam e0e845fe: DO NOT MERGE Do not allow shortcut for... tree | commitdiff
2011-03-15 Mike Lockwoodam 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM... tree | commitdiff
2011-03-14 Mike Lockwoodam e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults... tree | commitdiff
2011-03-10 TK MUNam f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX... tree | commitdiff
2011-03-10 TK MUNam 36469186: DO NOT MERGE WiMAX settings menu tree | commitdiff
2011-03-09 Jaikumar GaneshMerge "Return profile state disconnected when not yet... tree | commitdiff
2011-03-08 Dianne HackbornMerge "Fix issue #4021524 HMI63B: "Force stop" button... tree | commitdiff
2011-03-08 Amith Yamasaniam 35bc6b5f: Wifi disconnect policy summary text should... tree | commitdiff
2011-03-08 Hung-ying Tyanam f8a3a17c: Merge "Don\'t check states when mActivePro... tree | commitdiff
2011-03-08 Hung-ying TyanMerge "Don't check states when mActiveProfile is presen... tree | commitdiff
2011-03-05 Hung-ying TyanDon't check states when mActiveProfile is present tree | commitdiff
2011-03-04 Lorenzo Colittiresolved conflicts for merge of a4fb8c86 to honeycomb... tree | commitdiff
2011-03-04 Daisuke Miyakawaam 3a695a12: (-s ours) Not receive tick event in dateti... tree | commitdiff
2011-03-04 Lorenzo Colittiam f4393101: Merge "Support configuring the protocol... tree | commitdiff
2011-03-03 Daisuke Miyakawaam 96f05f90: (-s ours) fix datetime setup problem.... tree | commitdiff
2011-03-03 Eric Fischeram 39f443ce: (-s ours) am 0d9e74d4: Import revised... tree | commitdiff
2011-03-03 Amith Yamasaniam 665fc6aa: am b7e393bf: Merge "Bring back Wi-Fi sleep... tree | commitdiff
2011-03-03 Mike Lockwoodam 71dcf4d2: (-s ours) am 9d768735: (-s ours) am 0552d3... tree | commitdiff
2011-03-03 Mike Lockwoodam 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta... tree | commitdiff
2011-03-02 Mike Lockwoodam 0552d336: DO NOT MERGE: InstalledAppDetails: "Clear... tree | commitdiff
2011-03-02 Eric Fischeram ec40b31c: (-s ours) am 88764d6a: Merge "Import revis... tree | commitdiff
2011-03-02 Amith Yamasaniam 38d3353e: am 03e90322: Merge "Remove more entries... tree | commitdiff
2011-03-02 Robert GreenwaltMerge "Use new NetworkUtils.numericToInetAddress." tree | commitdiff
2011-03-01 Eric Fischeram 84b23881: (-s ours) am 3dd76cfd: Import revised... tree | commitdiff
2011-02-28 Irfan SheriffMerge "Handle airplane mode change for hotspot settings" tree | commitdiff
2011-02-28 Robert Greenwaltam ca5cc015: am 29ebf5fa: Merge "Just use device config... tree | commitdiff
2011-02-26 Doug Zongkeram 26c433c1: am 489c7bff: show Build.SERIAL in settings... tree | commitdiff
2011-02-25 Eric Fischeram 9dacc0a5: (-s ours) am 8639a46a: Import revised... tree | commitdiff
2011-02-25 Vasu NoriMerge "replace some ugly code with not-too-ugly code.." tree | commitdiff
2011-02-25 Amith Yamasaniam 88de52da: am 5d6f0a16: Merge "Remove / re-word some... tree | commitdiff
2011-02-24 Eric FischerMerge "Import revised translations." tree | commitdiff
2011-02-24 Eric Fischeram 5826947c: (-s ours) am 73c3d6bc: Import revised... tree | commitdiff
2011-02-23 Jaikumar GaneshMerge "Make BluetoothPan implement BluetoothProfile." tree | commitdiff
2011-02-23 Amith YamasaniMerge "Don't change the settings title when editing... tree | commitdiff
2011-02-23 Eric Fischeram 3d30b374: (-s ours) am 058f62ba: (-s ours) am bd0448... tree | commitdiff
2011-02-22 Eric Fischeram 058f62ba: (-s ours) am bd044818: Import revised... tree | commitdiff
2011-02-22 Amith YamasaniDon't change the settings title when editing VPN entries. tree | commitdiff
2011-02-18 Eric Fischeram bd044818: Import revised translations. DO NOT MERGE tree | commitdiff
2011-02-16 Eric Fischeram afdbc0d9: (-s ours) am 2279d3e1: Import revised... tree | commitdiff
2011-02-11 Amith Yamasaniam 5dd5aff8: (-s ours) am 255fa0e9: (-s ours) am aae04e... tree | commitdiff
2011-02-11 Amith Yamasaniam 255fa0e9: (-s ours) am aae04e43: Prevent monkeys... tree | commitdiff
2011-02-11 Amith Yamasaniam aae04e43: Prevent monkeys from USB tethering. It... tree | commitdiff
2011-02-10 Eric Fischeram 551a9876: (-s ours) am d422079a: (-s ours) am 47d2ec... tree | commitdiff
2011-02-10 Eric Fischeram d422079a: (-s ours) am 47d2ecd0: Import revised... tree | commitdiff
2011-02-09 Eric Fischeram 2cf42dfb: (-s ours) am c5d5334e: Import revised... tree | commitdiff
2011-02-09 Eric Fischeram 47d2ecd0: Import revised translations. DO NOT MERGE tree | commitdiff
2011-02-08 Eric Fischeram f0c435c6: (-s ours) am 805b5add: Import revised... tree | commitdiff
2011-02-07 Jake Hambyam 93d419a2: am 47cb1753: (-s ours) am 1798fc04: Merge... tree | commitdiff
2011-02-07 Jim Milleram 1d8c91fa: am 78713aed: Fix 3419077: implement new... tree | commitdiff
2011-02-07 Justin Hoam 683d8a21: am a9d8046c: Updated icons in settings tree | commitdiff
2011-02-05 Jake Hambyam 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a... tree | commitdiff
2011-02-02 Wink Savilleam ec4045fa: am 327147eb: Have SecuritySettings and... tree | commitdiff
2011-02-02 Andy Stadleram 37033e1a: am 9597406a: Restart encryption display... tree | commitdiff
2011-02-02 Andy Stadleram 5152fb05: am 95ef5575: Prevent NPE in onActivityResult tree | commitdiff
2011-02-02 Andy Stadleram 9d06aac2: am 1499740c: Preserve wakelock through... tree | commitdiff
2011-02-01 Amith Yamasaniam 7247e1a1: am 71863f3b: Merge "Use a custom media... tree | commitdiff
2011-02-01 Daisuke Miyakawaam d4eb7c6b: am 649b9f19: Disable left pane of "Input... tree | commitdiff
2011-02-01 Andy Stadleram b3d50cac: am 13d62049: More CryptKeeper UI work. tree | commitdiff
2011-02-01 Eric Fischeram ba275d29: (-s ours) am ba681faf: Merge "Import revis... tree | commitdiff
2011-02-01 Eric Fischeram 4975590f: (-s ours) am 2b78f433: (-s ours) am 93580e... tree | commitdiff
2011-02-01 Eric Fischeram 2b78f433: (-s ours) am 93580e22: Import revised... tree | commitdiff
2011-02-01 Eric Fischeram 93580e22: Import revised translations. DO NOT MERGE tree | commitdiff
2011-01-31 Amith Yamasaniam 015bf7ae: am a27868d9: Merge "Fix crash after adding... tree | commitdiff
2011-01-31 Daisuke Miyakawaam 6a452ce1: am 8ad1fb63: Merge "Disable back button... tree | commitdiff
2011-01-31 Andy Stadleram 865ca2a2: am 17141200: Final cleanup of "password... tree | commitdiff
2011-01-31 Justin Hoam 89ebb843: am 88866927: Merge "Updating Settings... tree | commitdiff
2011-01-31 Andy Stadleram d19b76f6: am f534db8a: Merge "Improvements to enable... tree | commitdiff
2011-01-31 Roy Westam 15dfde32: am 66f32a86: Fix bug 3405977. tree | commitdiff
2011-01-30 The Android Open... am 666fbc3b: Reconcile gingerbread-plus-aosp and honeycomb tree | commitdiff
2011-01-30 The Android Open... Mass merge from gingerbread - do not merge tree | commitdiff
2011-01-29 Justin Hoam 9685108e: am 6db0f05a: Deprecating old Settings... tree | commitdiff
next
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help