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 in master-release history after reset to master
[android-x86/packages-apps-Settings.git]
/
Android.mk
2013-06-18
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
2013-06-17
Christopher Tate
Merge "The Settings app needs privileged permissions"
blob
|
commitdiff
2013-06-17
Baligh Uddin
am 94496184: (-s ours) am 7a42c809: Merge "Import trans...
blob
|
commitdiff
|
diff to current
2013-06-17
Baligh Uddin
am 7a42c809: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-06-17
Christopher Tate
The Settings app needs privileged permissions
blob
|
commitdiff
2013-06-17
Baligh Uddin
am 44789f92: (-s ours) am f7c2889c: am 7f37c30b: (...
blob
|
commitdiff
|
diff to current
2013-06-17
Baligh Uddin
am f7c2889c: am 7f37c30b: (-s ours) Import translations...
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
am a5520e76: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-12
Baligh Uddin
am b45bac74: (-s ours) am 0117cc7c: Import translations...
blob
|
commitdiff
|
diff to current
2013-06-12
Baligh Uddin
am 0117cc7c: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-06-11
Vinit Deshapnde
Merge "Fix an NPE in WifiP2pSettings UI"
blob
|
commitdiff
|
diff to current
2013-06-11
Amith Yamasani
Merge "Remove Battery settings if battery is not present"
blob
|
commitdiff
|
diff to current
2013-06-10
The Android Open...
am 302bd5c7: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-06-10
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-06-10
The Android Open...
Reconcile with jb-mr2-release jb-mr2-zeroday-release...
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor...
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
am f3e827e8: Merge "Don\'t show ApnEditor as a dialog...
blob
|
commitdiff
|
diff to current
2013-06-07
Baligh Uddin
am e84b20ba: (-s ours) am 2db8ca13: Merge "Import trans...
blob
|
commitdiff
|
diff to current
2013-06-07
Baligh Uddin
am 2db8ca13: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
am 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps...
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
am 1b79c5c8: Merge "Allow hidden apps to opt-out" into...
blob
|
commitdiff
|
diff to current
2013-06-07
Baligh Uddin
Merge "Import translations. DO NOT MERGE"
blob
|
commitdiff
|
diff to current
2013-06-07
Alex Klyubin
am 3c862fb5: am 681b21f3: resolved conflicts for merge...
blob
|
commitdiff
|
diff to current
2013-06-07
Alex Klyubin
am 681b21f3: resolved conflicts for merge of 5d21820a...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 4fb1f873: am 56604046: am 5aa3f878: (-s ours) am...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
resolved conflicts for merge of 5d21820a to jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 56604046: am 5aa3f878: (-s ours) am 0c32da7e: am...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 01dbfbf9: am efd88e2c: Merge "Permit deactivation...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 60544e74: am 3dddd8cb: Ensure all active Device...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am efd88e2c: Merge "Permit deactivation of malformed...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 3dddd8cb: Ensure all active Device Admins are listed.
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am f750cdea: am adc3a282: am 9cd1d5e2: (-s ours) am...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am adc3a282: am 9cd1d5e2: (-s ours) am a9a28d2f: am...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 5f28c77b: am d6086125: Fix issue #9074296: Device...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am d6086125: Fix issue #9074296: Device Admins can...
blob
|
commitdiff
|
diff to current
2013-06-06
Amith Yamasani
am f71f25db: am d63bd61e: Merge "Fix NullPointerExcepti...
blob
|
commitdiff
|
diff to current
2013-06-06
Amith Yamasani
am d63bd61e: Merge "Fix NullPointerException at Running...
blob
|
commitdiff
|
diff to current
2013-06-06
The Android Open...
am 8548ddf2: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-06-06
The Android Open...
Reconcile with jb-mr2-release jb-mr2-zeroday-release...
blob
|
commitdiff
|
diff to current
2013-06-05
rich cannings
Add EventLog to report lock screen type
blob
|
commitdiff
|
diff to current
2013-06-03
Baligh Uddin
am 804b8b60: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-06-03
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-01
Baligh Uddin
am eb0fff7a: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-05-30
Jean-Baptiste Queru
Ignore 81476405 from AOSP
blob
|
commitdiff
|
diff to current
2013-05-30
Jean-Baptiste Queru
Merge "Settings: Fix Swedish translations"
blob
|
commitdiff
|
diff to current
2013-05-30
Robert Greenwalt
am 5ac90432: Don\'t show scan-always text if it is...
blob
|
commitdiff
|
diff to current
2013-05-29
Svetoslav
Merge "Remove Auto-rotate screen setting if a required...
blob
|
commitdiff
|
diff to current
2013-05-29
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-29
Baligh Uddin
am 1182f675: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-05-28
Russell Brenner
am c280acc3: Merge "Improved logic for Skip warning...
blob
|
commitdiff
|
diff to current
2013-05-28
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-23
Baligh Uddin
am 6fa5e627: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-05-23
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-22
Amith Yamasani
am 21f008e1: Merge "Update strings for clarity about...
blob
|
commitdiff
|
diff to current
2013-05-22
Alex Klyubin
am 7229e29f: Merge "Ensure all active Device Admins...
blob
|
commitdiff
|
diff to current
2013-05-22
Dianne Hackborn
am 8274b677: Fix issue #9074296: Device Admins can...
blob
|
commitdiff
|
diff to current
2013-05-22
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-22
Amith Yamasani
am 0b2781ae: Write restriction bundle right away for...
blob
|
commitdiff
|
diff to current
2013-05-21
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-21
Amith Yamasani
am 4abe488a: Merge "No back icon in action bar of APN...
blob
|
commitdiff
|
diff to current
2013-05-21
Amith Yamasani
am f88e6e5a: Don\'t mutate all instances of app icons...
blob
|
commitdiff
|
diff to current
2013-05-20
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-18
Amith Yamasani
am b96ebf9e: Merge "Load the avatar icon if it\'s not...
blob
|
commitdiff
|
diff to current
2013-05-17
Baligh Uddin
am 27d5c392: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-05-17
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-16
John Spurlock
am 31ce86d3: Merge "Hide notification listeners setting...
blob
|
commitdiff
|
diff to current
2013-05-16
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-05-16
Amith Yamasani
am e5fc4071: Merge "Return proper result code after...
blob
|
commitdiff
|
diff to current
2013-05-14
Amith Yamasani
am 00dc15d9: Merge "Add a settings icon to restricted...
blob
|
commitdiff
|
diff to current
2013-05-13
Robert Greenwalt
am d5d61a0a: Merge "Remove wifi scan-always dialog...
blob
|
commitdiff
|
diff to current
2013-05-13
Baligh Uddin
am 0a3cf293: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-05-08
Svetoslav
am 7e554395: Merge "Settings crashing if there are...
blob
|
commitdiff
|
diff to current
2013-05-08
Baligh Uddin
am 2c766ba5: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-05-06
Baligh Uddin
am c6adece0: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-05-06
Baligh Uddin
am 6681e954: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-05-01
Baligh Uddin
am 6c886cd3: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-05-01
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-05-01
Jake Hamby
am 18c4317b: Show correct A2DP connection status in...
blob
|
commitdiff
|
diff to current
2013-04-30
Baligh Uddin
am e3eb601d: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-04-30
Svetoslav Ganov
Merge "Remove Accessibility shortcut if the shortcut...
blob
|
commitdiff
|
diff to current
2013-04-30
Kenny Root
am 64914364: resolved conflicts for merge of 3c10f535...
blob
|
commitdiff
|
diff to current
2013-04-30
Kenny Root
resolved conflicts for merge of 3c10f535 to jb-mr2...
blob
|
commitdiff
|
diff to current
2013-04-30
Kenny Root
Merge "Track change to JSSE provider"
blob
|
commitdiff
|
diff to current
2013-04-29
Kenny Root
Track change to JSSE provider
blob
|
commitdiff
|
diff to current
2013-04-27
Kenny Root
am c814271f: Merge "Fix Clear Credentials item"
blob
|
commitdiff
|
diff to current
2013-04-16
Amith Yamasani
am c1e3983b: Merge "Fix NullPointerException at Running...
blob
|
commitdiff
|
diff to current
2013-04-16
Amith Yamasani
am 91b5fab9: Merge "Check if the Activity is finishing...
blob
|
commitdiff
|
diff to current
2013-04-15
The Android Automerger
merge in jb-mr2-release history after reset to jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-04-12
Maggie Benthall
Merge "Implement Settings app UX for when a user has...
blob
|
commitdiff
|
diff to current
2013-04-12
Emily Bernier
Merge "User restrictions for creds storage & user remov...
blob
|
commitdiff
|
diff to current
2013-04-12
Amith Yamasani
Merge "Embed the app restrictions fragment in the dual...
blob
|
commitdiff
|
diff to current
2013-04-12
Irfan Sheriff
Merge "Limit device name length" into jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-04-12
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-04-11
Benjamin Poiesz
am 2bd65910: am b0746763: Merge "Forcing the settings...
blob
|
commitdiff
|
diff to current
2013-04-11
Benjamin Poiesz
am b0746763: Merge "Forcing the settings apk to be...
blob
|
commitdiff
|
diff to current
next
OSDN Git Service
