OSDN Git Service

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
[android-x86/packages-apps-Settings.git] / proguard.flags
2016-11-09 Jessica WagantallMerge tag 'android-6.0.1_r74' into HEAD
2016-10-06 Jessica WagantallMerge tag 'android-6.0.1_r72' into HEAD
2016-09-21 Chih-Wei HuangMerge remote-tracking branch 'x86/marshmallow-x86'...
2016-09-07 Jessica WagantallMerge tag 'android-6.0.1_r66' into HEAD
2016-09-07 Chih-Wei HuangMerge tag 'android-6.0.1_r66' into marshmallow-x86 android-x86-6.0-r1
2016-08-08 Jaap Jan MeijerMerge branch 'marshmallow-x86_wo_su' into cm-13.0-x86
2016-08-08 Jaap Jan MeijerRevert "Settings: Add Superuser entry"
2016-05-05 Koushik DuttaSettings: Add Superuser entry
2016-04-18 Jessica WagantallMerge tag 'android-6.0.1_r30' into HEAD
2016-03-11 Steve KondikMerge tag 'android-6.0.1_r22' of https://android.google...
2016-01-05 Jessica WagantallMerge tag 'android-6.0.1_r10' into HEAD
2015-12-16 Roman BirgSettings: add switches for dashboard items
2015-12-08 Steve KondikMerge tag 'android-6.0.1_r3' of https://android.googles...
2015-11-17 Russell BrennerMerge "Block developer settings during SUW" into lmp...
2015-11-17 Russell Brenner[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
2015-11-16 Steve KondikMerge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora...
2015-11-05 Ricardo CerqueiraMerge tag 'android-6.0.0_r26' into HEAD
2015-11-04 Steve KondikMerge branch 'LA.BF64.1.2.2_rb4.6' of git://codeaurora...
2015-11-03 Sam Mortimer[2/2] Settings: Privacy Guard
2015-10-30 Danesh MRevert "Revert "Settings : Port forward statusbar setti...
2015-10-30 Danny Baumannsettings: Squashed commit of CMHW features
2015-10-30 Danesh MRevert "Settings : Port forward statusbar settings"
2015-10-29 Danesh MSettings : Port forward statusbar settings
2015-10-19 Geoff Mendalam f191953c: (-s ours) Import translations. DO NOT...
2015-10-14 Geoff Mendalam 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb54...
2015-10-14 Geoff Mendalam 974dfc1f: (-s ours) Import translations. DO NOT...
2015-10-12 Geoff Mendalam 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a9...
2015-10-12 Geoff Mendalam f598d0bc: (-s ours) Import translations. DO NOT...
2015-10-07 Geoff Mendalam ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a...
2015-10-07 Geoff Mendalam b4a027d0: (-s ours) Import translations. DO NOT...
2015-10-05 Geoff Mendalam 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fb...
2015-10-05 Geoff Mendalam 010d2fcd: (-s ours) Import translations. DO NOT...
2015-09-30 Geoff Mendalam dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491...
2015-09-30 Geoff Mendalam 77fc6ac5: (-s ours) Import translations. DO NOT...
2015-09-27 Baligh Uddinam 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e60...
2015-09-27 Baligh Uddinam ec981982: (-s ours) am 9b9d77f1: (-s ours) am 15243a...
2015-09-27 Baligh Uddinam ad7342ec: (-s ours) Import translations. DO NOT...
2015-09-21 Zach Jangam 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am...
2015-09-21 Zach Jangam 386c7763: (-s ours) am 564ec935: am 00721b4a: am...
2015-09-17 Zach Jangam b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO...
2015-08-05 Sanket Padaweam 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0...
2015-07-29 Sanket Padaweam df9b13af: am 74d85949: am e05f7143: Check for specia...
2015-05-02 Prerepa ViswanadhamMerge commit 'ab489de' into merge_try2
2015-05-02 Prerepa ViswanadhamMerge commit 'dd796e8' into merge_try2
2015-04-24 Etan CohenMerge commit '377c7c9' into merge2
2015-04-24 Etan CohenMerge commit '22ffff6' into merge2
2015-04-24 Alan Viveretteam 4a4f487e: am b6073c48: am 93ecb1f0: Merge "Settings...
2015-04-16 Elliott Hughesam ce9a533c: am 48e7e2ac: am 2e30bff1: Merge "Add Europ...
2015-04-10 Prerepa ViswanadhamMerge commit 'a14fc12' into merge_work
2015-04-10 Prerepa ViswanadhamMerge commit '2957939' into merge_work
2015-04-10 Prerepa ViswanadhamMerge commit '0507524' into merge_work
2015-04-02 Elliott Hughesam 483d7989: am ff095ab0: am 189d7e8e: Merge "Add Europ...
2015-04-02 Elliott Hughesam 14083abb: am 144c48e7: am 49fe5084: Merge "add Recif...
2015-04-01 Elliott HughesMerge "add Recife timezone"
2015-03-31 Etan CohenMerge commit '279cb4a' into merge
2015-03-31 Etan CohenMerge commit '898e486' into merge
2015-03-31 Etan CohenMerge commit 'fc75374' into merge
2015-03-31 Etan CohenMerge commit '2241607' into merge
2015-03-31 Etan CohenMerge commit 'fe47522' into merge
2015-03-27 Jason Samsam 57f132d0: Merge branch \'lmp-mr1-ub-dev\' of https...
2015-03-27 Stuart Scottam 1730be6f: am 7b6bd4d8: am 6b08e11e: am 53eec9fa...
2015-03-25 Stuart Scottam f6432118: am 4a682e56: am c28e80b8: am 53eec9fa...
2015-03-25 Prerepa ViswanadhamMerge remote-tracking branch 'goog/mirror-m-wireless...
2015-03-24 Geoff Mendalam d7d1f521: (-s ours) Merge "Import translations....
2015-03-24 Geoff Mendalam 4708550a: (-s ours) am 674d1d6b: (-s ours) am 47d342...
2015-03-23 Geoff Mendalam 18367b64: (-s ours) am 4b52bfbb: (-s ours) am d20acf...
2015-03-23 Geoff Mendalam 3cae91d7: (-s ours) Import translations. DO NOT...
2015-03-20 Jim MillerMerge "FingerprintSettings improvements"
2015-03-19 Jason MonkMerge "Only show 2 buttons in app info screen"
2015-03-19 Sanket PadaweMerge "Fix crash while trying to connect to network...
2015-03-18 Geoff Mendalam 7adbdd5b: (-s ours) am b9b1124c: (-s ours) am ac8641...
2015-03-18 Stuart ScottMerge "Add option to reset network settings to factory"
2015-03-09 Stuart ScottAdd option to reset network settings to factory
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 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added...
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-09-11 Carlos Valdiviaam 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don...
2014-08-16 Baligh Uddinam 2719eebf: (-s ours) am b3b64705: (-s ours) Import...
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-26 Baligh Uddinam 29450680: (-s ours) am eab9192a: (-s ours) Import...
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-13 Mark Salyzynresolved conflicts for merge of c2c64a31 to master
2014-05-28 Brian Carlstromam f3542909: am 2ce0dcda: am 70f2201c: Merge "Move...
2014-05-22 Baligh Uddinam a8e1e7c9: (-s ours) am 6a0bfc9f: (-s ours) Import...
2014-05-21 Paul LawrenceMerge "Add tablet pattern layout to avoid outsize patterns"
2014-05-21 Paul LawrenceMerge "Fix landscape mode for pattern decrypt dialog"
2014-05-21 Andres MoralesMerge "Fix master: deleting remaining file from revert."
2014-05-19 Alan ViveretteMerge "TouchFeedbackDrawable is now RippleDrawable"
2014-05-19 Paul LawrenceMerge "Improve power fail/reset"
2014-05-19 Paul LawrenceMerge "Fixing decryption messaging"
2014-05-19 The Android Automergermerge in master-release history after reset to 81bef1d7...
2014-05-18 John SpurlockVolumeZen: Sound & Notifications settings.
2014-04-03 Adrian Roosam 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10...
2014-04-03 Adrian Roosam 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20...
next