OSDN Git Service

Merge "VpnSettings: add support for server certificates." into ics-mr1
[android-x86/packages-apps-Settings.git] / res / xml / wifi_settings.xml
2011-09-14 The Android Open... Reconcile with gingerbread-mr4-release
2011-09-09 Jean-Baptiste QueruReconcile with gingerbread-release gingerbread-mr4...
2011-08-30 Ryan PC Gibsonam 57c88834: (-s ours) am 9fe36302: (-s ours) am 9cb97c...
2011-08-30 Ryan PC Gibsonam 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE...
2011-08-12 Amith Yamasaniam 7e1c6cc0: am d7d6c7ff: am 34d9b03f: Merge "Fix wrong...
2011-08-12 Amith Yamasaniam f14f96ef: am b3f6116e: am fd73824d: Merge "Fix:...
2011-08-12 Amith Yamasaniam d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior...
2011-08-12 Amith Yamasaniam b3f6116e: am fd73824d: Merge "Fix: Text is cut in...
2011-08-05 The Android Open... Reconcile with gingerbread-release gingerbread-mr4...
2011-07-14 Dianne Hackbornam f70f60c4: am 7d19d795: am b41b85dc: am c74500f4...
2011-07-14 John Wangam 25bd33e1: am d7b2dccb: Display IMEI and ICCID for...
2011-07-14 Dianne Hackbornam 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE...
2011-07-01 John Wangam ab824c81: (-s ours) am f44308a7: Display FCC id...
2011-06-27 Eric Fischeram d2157460: am 6a078ed3: (-s ours) am a18484fb: Import...
2011-06-27 Eric Fischeram 6a078ed3: (-s ours) am a18484fb: Import new translat...
2011-06-27 Dianne Hackbornam c9a477ae: am e3cfa9bc: am 13bac39d: Remove obsolete...
2011-06-27 Chia-chi YehMerge "Settings: add a new layout for VpnSettings."
2011-06-27 Chia-chi YehMerge "Settings: add a new layout for VpnDialog."
2011-06-27 Chia-chi YehMerge "Settings: revise VpnSettings."
2011-06-24 The Android Open... Reconcile with gingerbread-release
2011-06-23 Jaikumar Ganesham 45679d94: (-s ours) am 38ae9125: (-s ours) am 7ab669...
2011-06-23 Jaikumar Ganesham 47504c7b: am a7bb204a: am c6f14410: Merge "Remove...
2011-06-23 Kenny RootMerge "Change dummy calendar setting during locale...
2011-06-23 Jaikumar Ganesham 87c04ba6: am f3670df2: am 2c85966d: Merge "New strin...
2011-06-22 satokMerge "Add an activity to show an ime switch dialog"
2011-06-21 Jaikumar Ganesham 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE...
2011-06-21 Gilles DebunneSettings refactoring
2011-06-20 Jaikumar Ganesham a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT...
2011-06-20 Jaikumar Ganesham f3670df2: am 2c85966d: Merge "New strings for Blueto...
2011-06-17 Eric Fischeram 50c32a16: am 3c75fbc5: (-s ours) am 5bdc3e91: Import...
2011-06-16 Eric Fischeram 3c75fbc5: (-s ours) am 5bdc3e91: Import revised...
2011-06-16 Eric Fischeram 957bed6e: (-s ours) am 3bf263c9: am b5c4437f: Import...
2011-06-15 Amith Yamasaniam 80cc0ffa: am e7f7643c: am 6ef6f183: Stability fixes...
2011-06-13 Mike Lockwoodam c938a02b: am c1db1192: am d2a6f28f: Disable option...
2011-06-10 Freeman Ngam 945aac2e: am fb096074: am 148222fd: Merge "remove...
2011-06-10 Freeman Ngam a35506c7: am f2a9bd33: am 0a67cdb7: Merge "add ...
2011-06-10 Dianne Hackbornam 8d7ecabc: am 60d8b3f8: am 55c86911: Mark access...
2011-06-10 Justin Hoam 9209d20a: am ea8f103f: am 7825cb29: Fixing remaining...
2011-06-09 Jean-Baptiste QueruReconcile with gingerbread-release
2011-06-09 Irfan Sheriffam 4a1b8898: am f448c32d: Merge "Fix UI settings displa...
2011-06-08 Jaikumar Ganesham 3f3f390b: am a6daa21d: (-s ours) am 015788ca: Merge...
2011-06-08 Freeman Ngresolved conflicts for merge of ab48c22e to master
2011-06-08 Freeman Ngam 6beb924e: am 351367bb: am f368d4dc: Merge "add optio...
2011-06-08 Jaikumar Ganesham 37940170: (-s ours) am bd34e568: (-s ours) am eddb21...
2011-06-08 Jaikumar Ganesham eeb7803a: (-s ours) am aeca1851: (-s ours) am c955d8...
2011-06-08 Gilles Debunneam 62634b30: am 440ca974: am 8f1bd8a7: Bug 4539424...
2011-06-07 Jaikumar Ganesham a6daa21d: (-s ours) am 015788ca: Merge "Import trans...
2011-06-07 Marco Nelissenam 079e30cd: resolved conflicts for merge of 531bed61...
2011-06-07 Gilles Debunneam cfe26919: am 533b7b53: am 90599cdf: Merge "Used...
2011-06-07 Gilles Debunneam b7e7a8cb: am 2a9dfc5c: am 99da1a22: Always show...
2011-06-07 Jaikumar Ganesham bd34e568: (-s ours) am eddb21a2: Merge "Changes...
2011-06-07 Jaikumar Ganesham aeca1851: (-s ours) am c955d8ee: Merge "Allow users...
2011-06-06 Marco Nelissenresolved conflicts for merge of 531bed61 to honeycomb...
2011-06-03 Amith Yamasaniam 51a1bb15: am ad466222: am 51a9d157: Merge "Fix accou...
2011-06-03 Jeff Brownam a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a...
2011-06-03 Ben Komaloam 657a7ad8: am 1e43e694: am 57b17f50: Merge "Fix crypt...
2011-06-03 Amith Yamasaniam 1334d7fc: am 300c4f61: am 3a5b3494: Make the BT...
2011-06-03 Amith Yamasaniresolved conflicts for merge of 6c82fe07 to master
2011-06-02 Amith Yamasaniam be6cb943: am 9ef2713f: am 1f7014a2: Merge "Reduce...
2011-06-02 Gilles Debunneam b667422c: am 41a99004: am 53872769: Merge "Erase...
2011-06-02 Eric Fischeram 3518cdf9: (-s ours) am c3786952: am beee8290: Merge...
2011-06-01 Dianne Hackbornam c837756d: am b4799fc9: am aef746c4: Implement new...
2011-06-01 Freeman Ngam f0fae7f2: am 6356b17a: am d671182d: Merge "make...
2011-05-31 Adam Powellam 7d4e88b3: am 57218b5a: am 3c110e50: Fix account...
2011-05-31 Jim Milleram c78f8769: am fbc72cd6: am fd8f7f12: Merge "Fix 44624...
2011-05-26 Amith Yamasaniam f7d58032: am 6246d459: am e9f5a297: Merge "Fix blank...
2011-05-26 Gilles Debunneresolved conflicts for merge of b593a628 to master
2011-05-26 Amith Yamasaniam 0fbaacaa: am 138a695f: am cfd524f0: Visual adjustmen...
2011-05-25 Jim Milleram e3e9561b: am 7505d460: am d12b9509: Fix 4462497...
2011-05-24 Irfan Sheriffam b7c2d5b4: am 7c210ba5: Fix invalid linkspeed display
2011-05-24 Irfan Sheriffam 87661736: am 5ee2fb92: Merge "Fix submit button...
2011-05-24 Jim Milleram 9e8b6ba5: am 318f7850: am 360f0603: Fix 4462497...
2011-05-24 Jim Milleram 6ba50de7: am d36628a7: am e8ebec86: Fix 4462497...
2011-05-20 The Android Open... Reconcile with gingerbread-release honeycomb-release
2011-05-20 Irfan Sheriffam ba46f269: am a6f178a8: Merge "Fix enabling of submit...
2011-05-18 Eric Fischeram be94e211: (-s ours) am d6e23b9a: am ce116503: Import...
2011-05-11 Eric Fischeram e7c82caf: (-s ours) am d779e5df: am 0bbe27da: am...
2011-05-11 Eric Fischeram c258d997: (-s ours) am 450721fc: am 9766cccb: Import...
2011-05-09 John Wangam 71023531: am 22e52793: Update the MEID setting label.
2011-05-02 Robert Greenwaltam d65d1adb: am 3c3490c8: Use new RouteInfo class.
2011-04-28 Eric Fischeram a9b3463e: (-s ours) am 643e48b7: (-s ours) am 7c284c...
2011-04-28 Eric Fischeram 643e48b7: (-s ours) am 7c284c2c: Import revised...
2011-04-27 Conley Owensam fc5a1fe0: Ignoring empty list test in favor of comme...
2011-04-27 Conley OwensIgnoring empty list test in favor of commented out...
2011-04-20 Wink Savilleam ac706b98: am 2c3ec092: Remove getCurrentDataConnecti...
2011-04-18 Irfan SheriffMerge "Add summary details for add wifi network"
2011-04-16 Irfan SheriffAdd summary details for add wifi network
2011-04-12 Simon Wilsonam f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
2011-04-11 Eric Fischeram 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
2011-04-11 Simon Wilsonam 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
2011-04-11 Eric Fischeram 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
2011-04-05 Eric Fischeram dfb78827: (-s ours) am 955ab98f: Import revised...
2011-03-30 Park Sanghyunam 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add...
2011-03-30 Kenny Rootresolved conflicts for merge of 70a1ff03 to honeycomb...
2011-03-18 Eric Fischeram 9567622d: (-s ours) am c4eeeb29: Import revised...
2011-03-17 TK MUNam 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do...
2011-03-15 Mike Lockwoodam 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM...
2011-03-10 TK MUNam f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
2011-03-04 Lorenzo Colittiresolved conflicts for merge of a4fb8c86 to honeycomb...
2011-03-03 Mike Lockwoodam 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
next