OSDN Git Service

Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am...
[android-x86/packages-apps-Settings.git] / src / com / android / settings / vpn2 /
2018-04-09 Hansong ZhangMerge changes from topic "am-e8b13d24-dee0-4f84-89d4...
2018-04-09 Hansong Zhang[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-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-03-08 Antony Sargent[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...
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-19 Bill YiImport translations. DO NOT MERGE
2017-12-13 Bill YiImport translations. DO NOT MERGE
2017-12-08 Bill YiImport 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-12-05 Antony SargentReword bluetooth confirmation dialog am: e14d38a383...
2017-12-05 Antony SargentReword bluetooth confirmation dialog
2017-12-01 Antony SargentFix BluetoothPairingDialogTest to not expect device...
2017-11-26 Bill YiImport translations. DO NOT MERGE
2017-11-20 Bill YiMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-11-15 Bill YiImport translations. DO NOT MERGE
2017-11-07 Bill YiImport translations. DO NOT MERGE
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-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-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 Bill YiMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-27 Bill YiImport translations. DO NOT MERGE
2017-10-27 Christine FranksMove color mode to DisplayTransformManager
2017-10-27 Fan ZhangAdd strings to support multi-state vivid color management
2017-10-27 Bill YiImport translations. DO NOT MERGE
2017-10-27 Romain GuyAdd new color mode setting
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 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 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 SharkeyMerge "DO NOT MERGE. ActivityPicker shouldn't grant...
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 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-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permissions.
2017-09-06 Bill YiImport translations. DO NOT MERGE
2017-08-31 Phil Weaverresolve merge conflicts of 94c5202965 to oc-dr1-dev
2017-08-24 Bill YiImport translations. DO NOT MERGE
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: 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: de5df8b09...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: 9ffee0d53...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: 8e08a9bb7...
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: 9ffee0d53...
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
next