OSDN Git Service

Merge cherrypicks of [3116469, 3116470, 3116074, 3116075, 3116498, 3116499, 3117095...
[android-x86/packages-apps-Settings.git] / CleanSpec.mk
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permissions.
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: de5df8b09...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: 9ffee0d53...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: de5df8b09...
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2...
2017-07-18 Phil WeaverBack-port ag/2491664 am: 1d21738bd6
2017-07-12 Phil WeaverDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am...
2017-07-12 Phil WeaverDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am...
2017-04-12 Dmitry DementyevAdd permission check to Intents used by Authenticator...
2017-04-12 Dmitry DementyevAdd permission check to Intents used by Authenticator...
2017-03-08 Dmitry Dementyevresolve merge conflicts of 75ae46d035 to lmp-mr1-dev...
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-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 Fyodor Kupolovam 2731a18f: Merge "brightness status not refresh in...
2015-07-29 Fyodor Kupolovam 2731a18f: Merge "brightness status not refresh in...
2015-07-29 Sanket Padaweam df9b13af: am 74d85949: am e05f7143: Check for specia...
2015-07-14 Narayan Kamatham 83a25842: Merge "Lose some deprecated test annotations."
2015-07-14 Narayan Kamatham 83a25842: Merge "Lose some deprecated test annotations."
2015-06-08 Neil Fulleram 7779ef1a: (-s ours) Merge "Revert "Stop showing...
2015-06-08 Neil Fulleram 91e20200: (-s ours) Merge "Stop showing long names...
2015-06-04 Tom O'NeillMerge commit '1542f9c7' into manualmerge
2015-06-03 Jason Monkam 21c43016: Merge "Dont crash if there is no spellchecker"
2015-05-21 Fyodor Kupolovam b995c78f: (-s ours) Merge "Added SearchIndexProvider...
2015-05-19 Fyodor Kupolovam e84a5eac: Merge "Remove the check hasMultipleUsers...
2015-05-13 Robert Greenwaltam a1a2c91b: Merge "Remove phone information for a...
2015-05-11 Nick Kralevicham 1cfc2fc4: Merge "Avoid SElinux denial accessing...
2015-05-11 Chad Brubakeram 2ed7fc80: Merge "Track keystore password method...
2015-05-07 Nick Kralevicham a6867f55: Merge "Avoid SElinux denial accessing...
2015-05-02 Prerepa ViswanadhamMerge commit 'ab489de' into merge_try2
2015-05-02 Prerepa ViswanadhamMerge commit 'dd796e8' into merge_try2
2015-04-28 Elliott Hughesam a9657f55: Merge "Add Pacific/Noumea."
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-20 Stuart ScottMerge "Correct the way settings deals with subscriptions."
2015-04-16 Maurice LamMerge "[WifiSetup] Make dialogs immersive"
2015-04-16 Elliott Hughesam ce9a533c: am 48e7e2ac: am 2e30bff1: Merge "Add Europ...
2015-04-14 Stuart ScottMerge "Avoid mulitple calls to getActivity."
2015-04-13 John SpurlockMerge "Settings: External automatic rule settings."
2015-04-13 Fyodor KupolovMerge "Updated user_add_user_message_long"
2015-04-13 John SpurlockMerge "Settings: Mark string reference as untranslatable."
2015-04-13 Alan ViveretteMerge "Wrap tintable icons with correctly tinted drawab...
2015-04-13 Jeff SharkeyMerge "CleanSpec!"
2015-04-13 Jeff SharkeyCleanSpec!
2015-04-01 Elliott HughesMerge "add Recife timezone"
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 57641a8b: am d7e93570: am f11f9f47: Added a check...
2014-09-11 Carlos Valdiviaam ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4...
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-09 Jeff Sharkeyam e4dd4893: am 14f42ca9: am 110ddbfe: Merge "Fix NullP...
2014-04-30 Zhihai Xuam 3cfb6885: am d6b0b172: am 7dd84651: Merge "Display...
2014-04-30 Bill Yiam c8883585: am a3860afc: Merge commit \'36a1bbe8902534...
2014-04-25 Elliott Hughesresolved conflicts for merge of f90b5141 to master
2014-04-23 Baligh Uddinam 293b1fc0: (-s ours) am 06172af6: (-s ours) Import...
2014-04-22 Christopher Tateam a8351581: am 442f01c6: am 95228074: am c44d7c6b...
2014-04-17 Baligh Uddinam 89e96c30: (-s ours) am 54b5982f: (-s ours) Import...
2014-04-16 Wink Savilleam d5b8ee9b: am 242184ca: Merge "Allow tablets to send...
2014-04-16 Baligh Uddinam ce077b41: (-s ours) am 81ff7980: (-s ours) Import...
2014-04-10 Baligh Uddinam e38487bf: (-s ours) am b6b3172c: (-s ours) am 915ef6...
2014-04-10 Baligh Uddinam 119758c9: (-s ours) am 2632b25f: (-s ours) am fba8cd...
2014-04-10 Baligh Uddinam bb58405f: (-s ours) am 8bec9dba: (-s ours) Import...
2014-04-08 Baligh Uddinam c5c89671: (-s ours) am ffa6f523: (-s ours) am f56d83...
2014-04-08 Baligh Uddinam 4193b7d1: (-s ours) am b282957b: (-s ours) am 0f2228...
2014-04-08 Baligh Uddinam 6163642d: (-s ours) am b9abc323: (-s ours) Import...
2014-04-05 Xia Wangam 70ce016f: am d2f56f07: am ac768973: am ce11881a...
2014-04-04 Baligh Uddinam 1c89073d: (-s ours) am 87132265: (-s ours) am 3f3469...
2014-04-04 Baligh Uddinam 31e51bab: (-s ours) am 44e3e56f: (-s ours) am 216b5c...
2014-04-04 Baligh Uddinam 6c87824b: (-s ours) am 457681d5: (-s ours) Merge...
2014-04-03 Adrian RoosMerge commit 'e63ac36f' into master
2014-04-02 Xia Wangam 2f633ca3: am 8361a97c: am 3e238230: am 836eff87...
next