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
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 Shukla
Disabling the activate button when paused am: de5df8b09...
blob
|
commitdiff
2017-07-12
Phil Weaver
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am...
blob
|
commitdiff
2017-04-12
Dmitry Dementyev
Add permission check to Intents used by Authenticator...
blob
|
commitdiff
2015-09-17
Zach Jang
am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO...
blob
|
commitdiff
2015-07-29
Sanket Padawe
am df9b13af: am 74d85949: am e05f7143: Check for specia...
blob
|
commitdiff
2015-04-01
Elliott Hughes
Merge "add Recife timezone"
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am...
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am d7e93570: am f11f9f47: Added a check if a custom...
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb...
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am 57641a8b: am d7e93570: am f11f9f47: Added a check...
blob
|
commitdiff
2014-09-11
Carlos Valdivia
am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4...
blob
|
commitdiff
2014-08-16
Baligh Uddin
am 2719eebf: (-s ours) am b3b64705: (-s ours) Import...
blob
|
commitdiff
2014-08-11
Jason Monk
Merge "Don't allow creating guest when can't create...
blob
|
commitdiff
2014-08-08
Fabrice Di Meglio
Merge "Fix bug #16578018 Wi-Fi network list items shoul...
blob
|
commitdiff
2014-08-08
Adam Lesinski
Merge "Update to use new UsageStats API" into lmp-dev
blob
|
commitdiff
2014-08-08
Fabrice Di Meglio
Merge "Fix bug #16896118 SIM cards should ONLY appear...
blob
|
commitdiff
2014-08-07
Fabrice Di Meglio
Merge "Fix Wi-Fi Assistant padding" into lmp-dev
blob
|
commitdiff
2014-08-06
Fabrice Di Meglio
am 00acf0a6: am 6d327ca8: am fa8950be: Merge "Fix bug...
blob
|
commitdiff
2014-08-06
Fabrice Di Meglio
am 6d327ca8: am fa8950be: Merge "Fix bug #16800261...
blob
|
commitdiff
2014-08-06
Fabrice Di Meglio
am fa8950be: Merge "Fix bug #16800261 Settings app...
blob
|
commitdiff
2014-08-06
Fabrice Di Meglio
Merge "Fix bug #16800261 Settings app: Device administr...
blob
|
commitdiff
2014-08-06
Fabrice Di Meglio
Fix bug #16800261 Settings app: Device administrator...
blob
|
commitdiff
2014-08-05
Geoff Mendal
Merge "Import translations. DO NOT MERGE" into lmp-dev
blob
|
commitdiff
2014-08-05
Amith Yamasani
Merge "Fix removal of optional settings tiles" into...
blob
|
commitdiff
2014-08-05
Sander Alewijnse
Merge "Prevent launcher switching in Settings app....
blob
|
commitdiff
2014-07-16
Narayan Kamath
am 2abbacb7: Merge "Get rid of duplicated code in acces...
blob
|
commitdiff
|
diff to current
2014-07-06
Baligh Uddin
am 9bf54e70: (-s ours) am 395cf2d1: (-s ours) am 12d641...
blob
|
commitdiff
|
diff to current
2014-07-06
Baligh Uddin
am a64a0904: (-s ours) am 5a55f567: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2014-06-28
Baligh Uddin
am 5e34f2b6: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2014-06-26
Julia Reynolds
Merge "Use user restriction instead of pin to guard...
blob
|
commitdiff
|
diff to current
2014-06-26
Baligh Uddin
am 29450680: (-s ours) am eab9192a: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2014-06-25
Baligh Uddin
am 10b56ed3: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2014-06-23
Maurice Lam
Merge "[WifiSetup] Removed button bar"
blob
|
commitdiff
|
diff to current
2014-06-19
Yorke Lee
Merge "Revert "Add default Dialer preference to Settings""
blob
|
commitdiff
|
diff to current
2014-06-19
Baligh Uddin
am f6828477: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2014-06-18
Mark Salyzyn
am 3f7e5fc1: am ce258caa: Merge changes I8f067f14,I54d8...
blob
|
commitdiff
|
diff to current
2014-06-18
Griff Hazen
am 3ba14771: (-s ours) am bd042089: DO NOT MERGE Fix...
blob
|
commitdiff
|
diff to current
2014-06-18
Fabrice Di Meglio
Fix Security Settings padding
blob
|
commitdiff
|
diff to current
2014-06-17
Fabrice Di Meglio
Merge "Fix Security Settings padding"
blob
|
commitdiff
|
diff to current
2011-09-14
The Android Open...
Reconcile with gingerbread-mr4-release
blob
|
commitdiff
|
diff to current
2011-09-09
Jean-Baptiste Queru
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
|
diff to current
2011-08-30
Ryan PC Gibson
am 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am b3f6116e: am fd73824d: Merge "Fix: Text is cut in...
blob
|
commitdiff
|
diff to current
2011-08-05
The Android Open...
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
|
diff to current
2011-07-14
Dianne Hackborn
am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE...
blob
|
commitdiff
|
diff to current
2011-06-27
Eric Fischer
am 6a078ed3: (-s ours) am a18484fb: Import new translat...
blob
|
commitdiff
|
diff to current
2011-06-24
The Android Open...
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-21
Jaikumar Ganesh
am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am f3670df2: am 2c85966d: Merge "New strings for Blueto...
blob
|
commitdiff
|
diff to current
2011-06-16
Eric Fischer
am 3c75fbc5: (-s ours) am 5bdc3e91: Import revised...
blob
|
commitdiff
|
diff to current
2011-06-09
Jean-Baptiste Queru
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am a6daa21d: (-s ours) am 015788ca: Merge "Import trans...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am bd34e568: (-s ours) am eddb21a2: Merge "Changes...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am aeca1851: (-s ours) am c955d8ee: Merge "Allow users...
blob
|
commitdiff
|
diff to current
2011-06-06
Marco Nelissen
resolved conflicts for merge of 531bed61 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-05-20
The Android Open...
Reconcile with gingerbread-release honeycomb-release
blob
|
commitdiff
|
diff to current
2011-04-28
Eric Fischer
am 643e48b7: (-s ours) am 7c284c2c: Import revised...
blob
|
commitdiff
|
diff to current
2011-04-27
Conley Owens
Ignoring empty list test in favor of commented out...
blob
|
commitdiff
|
diff to current
2011-04-12
Simon Wilson
am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
blob
|
commitdiff
|
diff to current
2011-04-11
Simon Wilson
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
blob
|
commitdiff
|
diff to current
2011-04-05
Eric Fischer
am dfb78827: (-s ours) am 955ab98f: Import revised...
blob
|
commitdiff
|
diff to current
2011-03-30
Park Sanghyun
am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add...
blob
|
commitdiff
|
diff to current
2011-03-30
Kenny Root
resolved conflicts for merge of 70a1ff03 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-03-18
Eric Fischer
am 9567622d: (-s ours) am c4eeeb29: Import revised...
blob
|
commitdiff
|
diff to current
2011-03-17
TK MUN
am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do...
blob
|
commitdiff
|
diff to current
2011-03-15
Mike Lockwood
am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM...
blob
|
commitdiff
|
diff to current
2011-03-10
TK MUN
am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
blob
|
commitdiff
|
diff to current
2011-03-04
Lorenzo Colitti
resolved conflicts for merge of a4fb8c86 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-03-03
Mike Lockwood
am 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
blob
|
commitdiff
|
diff to current
2011-02-22
Eric Fischer
am 058f62ba: (-s ours) am bd044818: Import revised...
blob
|
commitdiff
|
diff to current
2011-02-11
Amith Yamasani
am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
blob
|
commitdiff
|
diff to current
2011-02-10
Eric Fischer
am d422079a: (-s ours) am 47d2ecd0: Import revised...
blob
|
commitdiff
|
diff to current
2011-02-05
Jake Hamby
am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
blob
|
commitdiff
|
diff to current
2011-02-01
Eric Fischer
am 2b78f433: (-s ours) am 93580e22: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-30
The Android Open...
Mass merge from gingerbread - do not merge
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am abdfaed8: (-s ours) am 5a2bb8c0: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 0cd5e21a: (-s ours) am 95112e5b: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-26
Amith Yamasani
Merge "Rearrange Applications settings items." into...
blob
|
commitdiff
|
diff to current
2011-01-26
Amith Yamasani
Merge "Fix missing title for WiFi Advanced settings...
blob
|
commitdiff
|
diff to current
2011-01-25
Jason parks
Merge "Display the correct encryption settings." into...
blob
|
commitdiff
|
diff to current
2011-01-25
The Android Automerger
merge in honeycomb-release history after reset to honeycomb
blob
|
commitdiff
|
diff to current
2011-01-25
Jason parks
Merge "More UI tweaks." into honeycomb
blob
|
commitdiff
|
diff to current
2011-01-25
Amith Yamasani
am 0cd3fd6a: am 48e031c7: Merge "Tabletize Device admin...
blob
|
commitdiff
|
diff to current
2011-01-25
Amith Yamasani
am 48e031c7: Merge "Tabletize Device administrator...
blob
|
commitdiff
|
diff to current
2011-01-25
Amith Yamasani
Merge "Tabletize Device administrator screen and fix...
blob
|
commitdiff
|
diff to current
2011-01-25
Amith Yamasani
Tabletize Device administrator screen and fix the layou...
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
next