OSDN Git Service

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am...
[android-x86/packages-apps-Settings.git] / res / layout / device_admin_settings.xml
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: de5df8b09...
2017-07-12 Phil WeaverDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am...
2017-04-12 Dmitry DementyevAdd permission check to Intents used by Authenticator...
2015-09-17 Zach Jangam b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO...
2015-07-29 Sanket Padaweam df9b13af: am 74d85949: am e05f7143: Check for specia...
2015-04-01 Elliott HughesMerge "add Recife timezone"
2015-01-29 Fyodor Kupolovam a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am...
2015-01-29 Fyodor Kupolovam d7e93570: am f11f9f47: Added a check if a custom...
2015-01-29 Fyodor Kupolovam 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb...
2015-01-29 Fyodor Kupolovam 57641a8b: am d7e93570: am f11f9f47: Added a check...
2014-09-11 Carlos Valdiviaam ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4...
2014-08-16 Baligh Uddinam 2719eebf: (-s ours) am b3b64705: (-s ours) Import...
2014-08-11 Jason MonkMerge "Don't allow creating guest when can't create...
2014-08-08 Fabrice Di MeglioMerge "Fix bug #16578018 Wi-Fi network list items shoul...
2014-08-08 Adam LesinskiMerge "Update to use new UsageStats API" into lmp-dev
2014-08-08 Fabrice Di MeglioMerge "Fix bug #16896118 SIM cards should ONLY appear...
2014-08-07 Fabrice Di MeglioMerge "Fix Wi-Fi Assistant padding" into lmp-dev
2014-08-06 Fabrice Di Meglioam 00acf0a6: am 6d327ca8: am fa8950be: Merge "Fix bug...
2014-08-06 Fabrice Di Meglioam 6d327ca8: am fa8950be: Merge "Fix bug #16800261...
2014-08-06 Fabrice Di Meglioam fa8950be: Merge "Fix bug #16800261 Settings app...
2014-08-06 Fabrice Di MeglioMerge "Fix bug #16800261 Settings app: Device administr...
2014-08-06 Fabrice Di MeglioFix bug #16800261 Settings app: Device administrator...
2014-08-05 Geoff MendalMerge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-05 Amith YamasaniMerge "Fix removal of optional settings tiles" into...
2014-08-05 Sander AlewijnseMerge "Prevent launcher switching in Settings app....
2014-07-16 Narayan Kamatham 2abbacb7: Merge "Get rid of duplicated code in acces...
2014-07-06 Baligh Uddinam 9bf54e70: (-s ours) am 395cf2d1: (-s ours) am 12d641...
2014-07-06 Baligh Uddinam a64a0904: (-s ours) am 5a55f567: (-s ours) Import...
2014-06-28 Baligh Uddinam 5e34f2b6: (-s ours) Import translations. DO NOT...
2014-06-26 Julia ReynoldsMerge "Use user restriction instead of pin to guard...
2014-06-26 Baligh Uddinam 29450680: (-s ours) am eab9192a: (-s ours) Import...
2014-06-25 Baligh Uddinam 10b56ed3: (-s ours) Import translations. DO NOT...
2014-06-23 Maurice LamMerge "[WifiSetup] Removed button bar"
2014-06-19 Yorke LeeMerge "Revert "Add default Dialer preference to Settings""
2014-06-19 Baligh Uddinam f6828477: (-s ours) Import translations. DO NOT...
2014-06-18 Mark Salyzynam 3f7e5fc1: am ce258caa: Merge changes I8f067f14,I54d8...
2014-06-18 Griff Hazenam 3ba14771: (-s ours) am bd042089: DO NOT MERGE Fix...
2014-06-18 Fabrice Di MeglioFix Security Settings padding
2014-06-17 Fabrice Di MeglioMerge "Fix Security Settings padding"
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 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE...
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 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE...
2011-06-27 Eric Fischeram 6a078ed3: (-s ours) am a18484fb: Import new translat...
2011-06-24 The Android Open... Reconcile with gingerbread-release
2011-06-21 Jaikumar Ganesham 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE...
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-16 Eric Fischeram 3c75fbc5: (-s ours) am 5bdc3e91: Import revised...
2011-06-09 Jean-Baptiste QueruReconcile with gingerbread-release
2011-06-07 Jaikumar Ganesham a6daa21d: (-s ours) am 015788ca: Merge "Import trans...
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-05-20 The Android Open... Reconcile with gingerbread-release honeycomb-release
2011-04-28 Eric Fischeram 643e48b7: (-s ours) am 7c284c2c: Import revised...
2011-04-27 Conley OwensIgnoring empty list test in favor of commented out...
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...
2011-02-22 Eric Fischeram 058f62ba: (-s ours) am bd044818: Import revised...
2011-02-11 Amith Yamasaniam 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
2011-02-10 Eric Fischeram d422079a: (-s ours) am 47d2ecd0: Import revised...
2011-02-05 Jake Hambyam 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
2011-02-01 Eric Fischeram 2b78f433: (-s ours) am 93580e22: Import revised...
2011-01-30 The Android Open... Mass merge from gingerbread - do not merge
2011-01-29 Eric Fischeram abdfaed8: (-s ours) am 5a2bb8c0: Import revised...
2011-01-29 Eric Fischeram 0cd5e21a: (-s ours) am 95112e5b: Import revised...
2011-01-26 Amith YamasaniMerge "Rearrange Applications settings items." into...
2011-01-26 Amith YamasaniMerge "Fix missing title for WiFi Advanced settings...
2011-01-25 Jason parksMerge "Display the correct encryption settings." into...
2011-01-25 The Android Automergermerge in honeycomb-release history after reset to honeycomb
2011-01-25 Jason parksMerge "More UI tweaks." into honeycomb
2011-01-25 Amith Yamasaniam 0cd3fd6a: am 48e031c7: Merge "Tabletize Device admin...
2011-01-25 Amith Yamasaniam 48e031c7: Merge "Tabletize Device administrator...
2011-01-25 Amith YamasaniMerge "Tabletize Device administrator screen and fix...
2011-01-25 Amith YamasaniTabletize Device administrator screen and fix the layou...
2010-06-15 The Android Open... merge from open-source master
2010-06-14 The Android Open... ignore from open-source master
2010-06-14 The Android Open... merge from open-source master
2010-06-14 The Android Open... merge from open-source master
2010-06-11 The Android Open... merge from open-source master
2010-05-19 The Android Open... merge from open-source master
2010-05-19 The Android Open... merge from open-source master
2010-05-12 The Android Open... merge from open-source master
2010-05-12 The Android Open... merge from open-source master
2010-04-21 The Android Open... merge from open-source master
next