summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-05242-2269/+1535
|\
| * Import translations. DO NOT MERGEBill Yi2017-02-036-21/+21
| * Don't show dialog when create the base view.Shijian Li2017-02-011-1/+0
| |\
| | * Don't show dialog when create the base view.Shijian Li2017-01-261-1/+0
| * | Merge "Set USER_FIXED for all non-granted permissions as long as one in the g...Shijian Li2017-01-240-0/+0
| |\ \ | | |/
| | * Merge "Set USER_FIXED for all non-granted permissions as long as one in the g...TreeHugger Robot2017-01-242-0/+41
| | |\
| * | \ Set USER_FIXED for all non-granted permissions as long as one in the group is...Shijian Li2017-01-242-0/+41
| |\ \ \ | | | |/ | | |/|
| | * | Set USER_FIXED for all non-granted permissions as long as one in the groupShijian Li2017-01-232-0/+41
| * | | Tweak resource selector to only pick width for watch percentage size.Michael Kwan2017-01-235-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Tweak resource selector to only pick width for watch percentage size.Michael Kwan2017-01-215-0/+0
| | |/
| * | Partial cherry-pick changes on permission model change.Shijian Li2017-01-203-33/+26
| |\ \ | | |/
| | * Partial cherry-pick changes on permission model change.Shijian Li2017-01-193-33/+26
| * | Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ...Philip P. Moltmann2017-01-100-0/+0
| |\ \ | | |/
| | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ...Philip P. Moltmann2017-01-100-0/+0
| | |\
| | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ...Philip P. Moltmann2017-01-100-0/+0
| | | |\
| | | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ...Philip P. Moltmann2017-01-100-0/+0
| | | | |\
| | | | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ...Philip P. Moltmann2017-01-100-0/+0
| | | | | |\
| | | | | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27Philip P. Moltmann2017-01-101-6/+6
| | | | | | |\
| | | | | | | * Prioritize package installer intent filter am: 17e1b04990Philip P. Moltmann2017-01-101-6/+6
| | | | | | | |\
| | | | | | | | * Prioritize package installer intent filterPhilip P. Moltmann2017-01-101-6/+6
| | | | | | | | |\
| | | | | | | | | * Prioritize package installer intent filterPhilip P. Moltmann2016-12-081-6/+6
| * | | | | | | | | Prioritize package installer intent filter am: 540a404bd4 am: 494808ab11 am: ...Philip P. Moltmann2017-01-101-8/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Prioritize package installer intent filter am: 540a404bd4 am: 494808ab11Philip P. Moltmann2017-01-101-8/+8
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Prioritize package installer intent filter am: 540a404bd4Philip P. Moltmann2017-01-101-8/+8
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Prioritize package installer intent filterPhilip P. Moltmann2017-01-101-8/+8
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Prioritize package installer intent filterPhilip P. Moltmann2016-12-091-8/+8
| * | | | | | | | | Merge "Don't set USER_FIXED when revoking a permission inside Settings -> App...Shijian Li2017-01-090-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Don't set USER_FIXED when revoking a permission inside Settings -> App...TreeHugger Robot2017-01-091-1/+1
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Don't set USER_FIXED when revoking a permission inside Settings -> App.Shijian Li2017-01-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Don't set USER_FIXED when revoking a permission inside Settings -> App.Shijian Li2017-01-091-1/+1
| * | | | | | | | | | Add refresh logic for individually controlled permission in onResume.Shijian Li2017-01-091-3/+14
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add refresh logic for individually controlled permission in onResume.Shijian Li2017-01-091-3/+14
| | |/ / / / / / / /
| * | | | | | | | | Expand all permissions when permissions in a group are individually managed.Shijian Li2017-01-032-53/+116
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Expand all permissions when permissions in a group are individually managed.Shijian Li2017-01-032-53/+116
| * | | | | | | | | Merge "stop incorrectly showing unknown sources prompt" am: 5e4d32ccfcDaniel Micay2016-12-131-0/+1
| * | | | | | | | | Merge "Add Bluetooth toggle prompts - package installer" into cw-f-devIvan Podogov2016-12-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Add Bluetooth toggle prompts - package installer" into cw-f-devIvan Podogov2016-12-132-3/+7
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Add Bluetooth toggle prompts - package installerSvet Ganov2016-12-132-3/+7
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add Bluetooth toggle prompts - package installerSvet Ganov2016-12-022-3/+7
| * | | | | | | | | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | | | * | | | | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | * | | | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | | |/ / / | | | | | | | |/| | |
| | | | | | | * | | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | | |/ / | | | | | | | | |/| |
| | | | | | | | * | | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | | | | | | | |\ \ \ | | | | | | | | | | |/ | | | | | | | | | |/|
| | | | | | | | | * | Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daa...Philip P. Moltmann2016-12-080-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ Merge "Prioritze package installer intent filter" into lmp-dev am: 57df7d5daaPhilip P. Moltmann2016-12-080-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ Merge "Prioritze package installer intent filter" into lmp-devPhilip P. Moltmann2016-12-080-0/+0
| | | | | | | | | | | |\ \