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]
/
AndroidManifest.xml
2013-06-17
Baligh Uddin
am 94496184: (-s ours) am 7a42c809: Merge "Import trans...
blob
|
commitdiff
2013-06-17
Baligh Uddin
am 7a42c809: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-06-17
Baligh Uddin
am 44789f92: (-s ours) am f7c2889c: am 7f37c30b: (...
blob
|
commitdiff
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
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
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
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
2013-06-11
Amith Yamasani
Merge "Remove Battery settings if battery is not present"
blob
|
commitdiff
2013-06-10
The Android Open...
am 302bd5c7: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
2013-06-10
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
2013-06-10
The Android Open...
Reconcile with jb-mr2-release jb-mr2-zeroday-release...
blob
|
commitdiff
|
diff to current
2013-06-09
The Android Automerger
merge in jb-mr2-zeroday-release history after reset...
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
Don't show ApnEditor as a dialog
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor...
blob
|
commitdiff
2013-06-07
Amith Yamasani
am f3e827e8: Merge "Don\'t show ApnEditor as a dialog...
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
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
Amith Yamasani
Don't show ApnEditor as a dialog
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 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all activ...
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
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 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #90742...
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
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-03
Baligh Uddin
am ac617824: (-s ours) am 804b8b60: Import translations...
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...
am b30d81d1: (-s ours) Reconcile with jb-mr2-release...
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 971d090a: (-s ours) am eb0fff7a: Merge "Import trans...
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
am 8527d6d1: am 46cd7f64: Ignore 81476405 from AOSP
blob
|
commitdiff
|
diff to current
2013-05-30
Jean-Baptiste Queru
Ignore 81476405 from AOSP
blob
|
commitdiff
|
diff to current
2013-05-30
Robert Greenwalt
am f96cfad3: am 5ac90432: Don\'t show scan-always text...
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...
am ed7bc2fa: (-s ours) Reconcile with jb-mr2-release...
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 5fd8a311: (-s ours) am 1182f675: Merge "Import trans...
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 1f9e42cd: am c280acc3: Merge "Improved logic for...
blob
|
commitdiff
|
diff to current
2013-05-28
The Android Open...
am 52f3b7c3: (-s ours) Reconcile with jb-mr2-release...
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 5c20af4c: (-s ours) am 6fa5e627: Import translations...
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...
am 2dafd362: (-s ours) Reconcile with jb-mr2-release...
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 73662629: am 21f008e1: Merge "Update strings for...
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 1eb2064f: am 7229e29f: Merge "Ensure all active...
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 eeeccdc6: am 8274b677: Fix issue #9074296: Device...
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 Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-05-22
The Android Open...
am ae006e70: (-s ours) Reconcile with jb-mr2-release...
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 18d44684: am 0b2781ae: Write restriction bundle...
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...
am 7e18ed8c: (-s ours) Reconcile with jb-mr2-release...
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 966c2d3f: am b514a95c: am 4abe488a: Merge "No back...
blob
|
commitdiff
|
diff to current
2013-05-21
Amith Yamasani
am b514a95c: am 4abe488a: Merge "No back icon in action...
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 738c373f: am f88e6e5a: Don\'t mutate all instances...
blob
|
commitdiff
|
diff to current
2013-05-20
Amith Yamasani
Merge "No back icon in action bar of APN Settings"
blob
|
commitdiff
|
diff to current
2013-05-20
The Android Open...
am d82fa081: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-05-20
smitha.x.smitha
No back icon in action bar of APN Settings
blob
|
commitdiff
|
diff to current
2013-05-18
Amith Yamasani
am 5675f50c: am b96ebf9e: Merge "Load the avatar icon...
blob
|
commitdiff
|
diff to current
2013-05-17
Baligh Uddin
am 8ea4fe7a: (-s ours) am 27d5c392: Import translations...
blob
|
commitdiff
|
diff to current
2013-05-17
The Android Open...
am 958c30d4: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-05-16
John Spurlock
am cea06adc: am 31ce86d3: Merge "Hide notification...
blob
|
commitdiff
|
diff to current
2013-05-16
The Android Open...
am d668d744: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-05-16
Amith Yamasani
am 010ab3bd: am e5fc4071: Merge "Return proper result...
blob
|
commitdiff
|
diff to current
2013-05-14
Amith Yamasani
am 813d2383: am 00dc15d9: Merge "Add a settings icon...
blob
|
commitdiff
|
diff to current
2013-05-14
Amith Yamasani
Merge "Add a settings icon to restricted profile config...
blob
|
commitdiff
|
diff to current
2013-05-14
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-05-14
The Android Automerger
merge in jb-mr2-release history after reset to jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-05-13
Amith Yamasani
Merge "Use circular avatars wherever appropriate"
blob
|
commitdiff
|
diff to current
2013-05-13
Robert Greenwalt
am b2dccc41: am d5d61a0a: Merge "Remove wifi scan-alway...
blob
|
commitdiff
|
diff to current
next