OSDN Git Service

merge in master-release history after reset to master
[android-x86/packages-apps-Settings.git] / AndroidManifest.xml
2013-06-17 Baligh Uddinam 94496184: (-s ours) am 7a42c809: Merge "Import trans...
2013-06-17 Baligh Uddinam 7a42c809: Merge "Import translations. DO NOT MERGE...
2013-06-17 Baligh Uddinam 44789f92: (-s ours) am f7c2889c: am 7f37c30b: (...
2013-06-17 Baligh Uddinam f7c2889c: am 7f37c30b: (-s ours) Import translations...
2013-06-13 The Android Open... am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday...
2013-06-13 The Android Open... Reconcile with jb-mr2-zeroday-release - do not merge
2013-06-13 The Android Open... am a5520e76: (-s ours) Reconcile with jb-mr2-release...
2013-06-13 The Android Open... Reconcile with jb-mr2-release - do not merge
2013-06-12 Baligh Uddinam b45bac74: (-s ours) am 0117cc7c: Import translations...
2013-06-12 Baligh Uddinam 0117cc7c: Import translations. DO NOT MERGE
2013-06-11 Vinit DeshapndeMerge "Fix an NPE in WifiP2pSettings UI"
2013-06-11 Amith YamasaniMerge "Remove Battery settings if battery is not present"
2013-06-10 The Android Open... am 302bd5c7: (-s ours) Reconcile with jb-mr2-release...
2013-06-10 The Android Automergermerge in master-release history after reset to master
2013-06-10 The Android Open... Reconcile with jb-mr2-release jb-mr2-zeroday-release...
2013-06-09 The Android Automergermerge in jb-mr2-zeroday-release history after reset...
2013-06-07 Amith YamasaniDon't show ApnEditor as a dialog
2013-06-07 Amith Yamasaniam 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor...
2013-06-07 Amith Yamasaniam f3e827e8: Merge "Don\'t show ApnEditor as a dialog...
2013-06-07 Amith YamasaniMerge "Don't show ApnEditor as a dialog" into jb-mr2-dev
2013-06-07 Baligh Uddinam e84b20ba: (-s ours) am 2db8ca13: Merge "Import trans...
2013-06-07 Baligh Uddinam 2db8ca13: Merge "Import translations. DO NOT MERGE...
2013-06-07 Amith Yamasaniam 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps...
2013-06-07 Amith Yamasaniam 1b79c5c8: Merge "Allow hidden apps to opt-out" into...
2013-06-07 Amith YamasaniDon't show ApnEditor as a dialog
2013-06-07 Alex Klyubinam 3c862fb5: am 681b21f3: resolved conflicts for merge...
2013-06-07 Alex Klyubinam 681b21f3: resolved conflicts for merge of 5d21820a...
2013-06-06 Alex Klyubinam 4fb1f873: am 56604046: am 5aa3f878: (-s ours) am...
2013-06-06 Alex Klyubinresolved conflicts for merge of 5d21820a to jb-mr2-dev
2013-06-06 Alex Klyubinam 56604046: am 5aa3f878: (-s ours) am 0c32da7e: am...
2013-06-06 Alex Klyubinam 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am...
2013-06-06 Alex Klyubinam 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit...
2013-06-06 Alex Klyubinam 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all activ...
2013-06-06 Alex Klyubinam 01dbfbf9: am efd88e2c: Merge "Permit deactivation...
2013-06-06 Alex Klyubinam 60544e74: am 3dddd8cb: Ensure all active Device...
2013-06-06 Dianne Hackbornam f750cdea: am adc3a282: am 9cd1d5e2: (-s ours) am...
2013-06-06 Dianne Hackbornam adc3a282: am 9cd1d5e2: (-s ours) am a9a28d2f: am...
2013-06-06 Dianne Hackbornam 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
2013-06-06 Dianne Hackbornam 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #90742...
2013-06-06 Dianne Hackbornam 5f28c77b: am d6086125: Fix issue #9074296: Device...
2013-06-06 Amith Yamasaniam f71f25db: am d63bd61e: Merge "Fix NullPointerExcepti...
2013-06-06 Amith Yamasaniam d63bd61e: Merge "Fix NullPointerException at Running...
2013-06-06 The Android Open... am 8548ddf2: (-s ours) Reconcile with jb-mr2-release...
2013-06-06 The Android Open... Reconcile with jb-mr2-release jb-mr2-zeroday-release...
2013-06-03 Baligh Uddinam ac617824: (-s ours) am 804b8b60: Import translations...
2013-06-03 Baligh Uddinam 804b8b60: Import translations. DO NOT MERGE
2013-06-03 The Android Open... am b30d81d1: (-s ours) Reconcile with jb-mr2-release...
2013-06-03 The Android Open... Reconcile with jb-mr2-release - do not merge
2013-06-01 Baligh Uddinam 971d090a: (-s ours) am eb0fff7a: Merge "Import trans...
2013-06-01 Baligh Uddinam eb0fff7a: Merge "Import translations. DO NOT MERGE...
2013-05-30 Jean-Baptiste Queruam 8527d6d1: am 46cd7f64: Ignore 81476405 from AOSP
2013-05-30 Jean-Baptiste QueruIgnore 81476405 from AOSP
2013-05-30 Robert Greenwaltam f96cfad3: am 5ac90432: Don\'t show scan-always text...
2013-05-30 Jean-Baptiste QueruMerge "Settings: Fix Swedish translations"
2013-05-30 Robert Greenwaltam 5ac90432: Don\'t show scan-always text if it is...
2013-05-29 SvetoslavMerge "Remove Auto-rotate screen setting if a required...
2013-05-29 The Android Open... am ed7bc2fa: (-s ours) Reconcile with jb-mr2-release...
2013-05-29 The Android Open... Reconcile with jb-mr2-release - do not merge
2013-05-29 Baligh Uddinam 5fd8a311: (-s ours) am 1182f675: Merge "Import trans...
2013-05-29 Baligh Uddinam 1182f675: Merge "Import translations. DO NOT MERGE...
2013-05-28 Russell Brenneram 1f9e42cd: am c280acc3: Merge "Improved logic for...
2013-05-28 The Android Open... am 52f3b7c3: (-s ours) Reconcile with jb-mr2-release...
2013-05-28 Russell Brenneram c280acc3: Merge "Improved logic for Skip warning...
2013-05-28 The Android Open... Reconcile with jb-mr2-release - do not merge
2013-05-23 Baligh Uddinam 5c20af4c: (-s ours) am 6fa5e627: Import translations...
2013-05-23 Baligh Uddinam 6fa5e627: Import translations. DO NOT MERGE
2013-05-23 The Android Open... am 2dafd362: (-s ours) Reconcile with jb-mr2-release...
2013-05-23 The Android Open... Reconcile with jb-mr2-release - do not merge
2013-05-22 Amith Yamasaniam 73662629: am 21f008e1: Merge "Update strings for...
2013-05-22 Amith Yamasaniam 21f008e1: Merge "Update strings for clarity about...
2013-05-22 Alex Klyubinam 1eb2064f: am 7229e29f: Merge "Ensure all active...
2013-05-22 Alex Klyubinam 7229e29f: Merge "Ensure all active Device Admins...
2013-05-22 Dianne Hackbornam eeeccdc6: am 8274b677: Fix issue #9074296: Device...
2013-05-22 Dianne Hackbornam 8274b677: Fix issue #9074296: Device Admins can...
2013-05-22 The Android Automergermerge in master-release history after reset to master
2013-05-22 The Android Open... am ae006e70: (-s ours) Reconcile with jb-mr2-release...
2013-05-22 The Android Open... Reconcile with jb-mr2-release - do not merge
2013-05-22 Amith Yamasaniam 18d44684: am 0b2781ae: Write restriction bundle...
2013-05-22 Amith Yamasaniam 0b2781ae: Write restriction bundle right away for...
2013-05-21 The Android Open... am 7e18ed8c: (-s ours) Reconcile with jb-mr2-release...
2013-05-21 The Android Open... Reconcile with jb-mr2-release - do not merge
2013-05-21 Amith Yamasaniam 966c2d3f: am b514a95c: am 4abe488a: Merge "No back...
2013-05-21 Amith Yamasaniam b514a95c: am 4abe488a: Merge "No back icon in action...
2013-05-21 Amith Yamasaniam 4abe488a: Merge "No back icon in action bar of APN...
2013-05-21 Amith Yamasaniam 738c373f: am f88e6e5a: Don\'t mutate all instances...
2013-05-20 Amith YamasaniMerge "No back icon in action bar of APN Settings"
2013-05-20 The Android Open... am d82fa081: (-s ours) Reconcile with jb-mr2-release...
2013-05-20 smitha.x.smithaNo back icon in action bar of APN Settings
2013-05-18 Amith Yamasaniam 5675f50c: am b96ebf9e: Merge "Load the avatar icon...
2013-05-17 Baligh Uddinam 8ea4fe7a: (-s ours) am 27d5c392: Import translations...
2013-05-17 The Android Open... am 958c30d4: (-s ours) Reconcile with jb-mr2-release...
2013-05-16 John Spurlockam cea06adc: am 31ce86d3: Merge "Hide notification...
2013-05-16 The Android Open... am d668d744: (-s ours) Reconcile with jb-mr2-release...
2013-05-16 Amith Yamasaniam 010ab3bd: am e5fc4071: Merge "Return proper result...
2013-05-14 Amith Yamasaniam 813d2383: am 00dc15d9: Merge "Add a settings icon...
2013-05-14 Amith YamasaniMerge "Add a settings icon to restricted profile config...
2013-05-14 The Android Automergermerge in master-release history after reset to master
2013-05-14 The Android Automergermerge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-13 Amith YamasaniMerge "Use circular avatars wherever appropriate"
2013-05-13 Robert Greenwaltam b2dccc41: am d5d61a0a: Merge "Remove wifi scan-alway...
next