OSDN Git Service

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
[android-x86/packages-apps-Settings.git] / Android.mk
2018-05-24 Android Build Merg... [automerger skipped] Merge translations of Bluetooth...
2018-05-24 Android Build Merg... [automerger skipped] Merge translations of Bluetooth...
2018-05-24 Android Build Merg... [automerger skipped] Merge translations of Bluetooth...
2018-05-02 Android Build Merg... [automerger skipped] Merge translations of Bluetooth...
2018-05-02 Android Build Merg... [automerger skipped] Merge translations of Bluetooth...
2018-05-02 Android Build Merg... [automerger skipped] Merge translations of Bluetooth...
2018-04-02 Android Build Merg... [automerger] DO NOT MERGE Fix unexpected behavior in...
2018-04-02 Android Build Merg... [automerger] DO NOT MERGE Fix unexpected behavior in...
2018-04-02 Android Build Merg... [automerger] DO NOT MERGE Fix unexpected behavior in...
2018-04-02 Android Build Merg... [automerger] DO NOT MERGE Fix unexpected behavior in...
2018-04-02 Android Build Merg... [automerger] DO NOT MERGE Fix unexpected behavior in...
2018-02-13 Android Build Merg... [automerger skipped] Import translations. DO NOT MERGE...
2018-02-13 Android Build Merg... [automerger skipped] Import translations. DO NOT MERGE...
2018-02-13 Android Build Merg... [automerger skipped] Import translations. DO NOT MERGE...
2017-12-05 Antony SargentReword bluetooth confirmation dialog am: e14d38a383...
2017-12-05 Antony SargentReword bluetooth confirmation dialog am: e14d38a383...
2017-12-05 Antony SargentReword bluetooth confirmation dialog am: e14d38a383...
2017-11-03 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-11-03 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-11-03 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-11-03 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
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-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permissions.
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permissions.
2017-10-11 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: af5d8b9b0...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: de5df8b09...
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: af5d8b9b0...
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-08-16 Suprabh ShuklaDisabling the activate button when paused am: af5d8b9b0...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: de5df8b09...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: 8e08a9bb7...
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-08-16 Suprabh ShuklaDisabling the activate button when paused
2017-08-16 Suprabh ShuklaDisabling the activate button when paused
2017-07-26 Bill YiImport translations. DO NOT MERGE
2017-07-19 Phil WeaverMerge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77...
2017-07-19 Phil WeaverMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886...
2017-07-19 Phil WeaverMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886...
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886...
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into nyc-dev am: 3adf58596...
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2...
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into nyc-dev
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2...
2017-07-18 Phil WeaverBack-port ag/2491664 am: 1d21738bd6 am: 4150739791...
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2...
2017-07-18 Phil WeaverBack-port ag/2491664 am: 1d21738bd6 am: 4150739791...
2017-07-18 Phil WeaverBack-port ag/2491664 am: 1d21738bd6 am: 4150739791...
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-18 Phil WeaverMerge "Back-port ag/2491664" into lmp-dev
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-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-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-07-11 Bill YiImport translations. DO NOT MERGE
2017-06-09 Antony SargentMerge "Set advanced battery usage items as non-selectab...
2017-06-07 TreeHugger RobotMerge "Hide Display Theme from search results when...
2017-06-06 TreeHugger RobotMerge "Use the standard place holder for the security...
2017-06-06 TreeHugger RobotMerge "If two groups are posted to settings, remove...
2017-06-06 TreeHugger RobotMerge "Make icons colorful for Security settings."...
2017-06-06 Lorenzo ColittiMerge "Wifi details: minor ordering fixes." into oc-dev
2017-06-06 TreeHugger RobotMerge "Revert "Initial search bar implementation."...
2017-06-06 TreeHugger RobotMerge "Revert "Revert "Revert "Replace dynamic summary...
2017-06-06 Daniel NishiMerge "Band aid to fix overly long text in donut."...
2017-06-06 Andrew SappersteinRevert "Initial search bar implementation."
2017-06-06 Salvador MartinezMerge "Revert "Remove dynamic summary from Security...
2017-06-02 TreeHugger RobotMerge "wifi: use WifiSavedConfigUtils to retrieve saved...
2017-06-02 TreeHugger RobotMerge "Delay adding app settings link until data fetch...
2017-06-02 Lei YuMerge "Refine the ProgressCategory" into oc-dev
2017-06-02 TreeHugger RobotMerge "Disallow buzz/beep/disturb changes for notificat...
2017-06-02 Alison CichowlasMerge "Add group name into channel summary, if applicab...
next