summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Implement base version of GrantPermissions dialog"Anthony Hugh2015-08-2121-630/+4
* Implement base version of GrantPermissions dialogAnthony Hugh2015-08-2121-4/+630
* am 63d27c9a: am a9ec5bcd: Fix issue #23115154: APR: NPE in PackageInstallerDianne Hackborn2015-08-111-0/+4
|\
| * am a9ec5bcd: Fix issue #23115154: APR: NPE in PackageInstallerDianne Hackborn2015-08-111-0/+4
| |\
| | * Fix issue #23115154: APR: NPE in PackageInstallerDianne Hackborn2015-08-111-0/+4
* | | am 818bd4b9: (-s ours) am 57c56fb3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-110-0/+0
|\| |
| * | am 57c56fb3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-110-0/+0
| |\|
| | * Import translations. DO NOT MERGEGeoff Mendal2015-08-1078-80/+80
* | | am 4a557b1a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-100-0/+0
|\| |
| * | Import translations. DO NOT MERGEGeoff Mendal2015-08-101-1/+1
* | | am bd3b19ab: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
|\| |
| * | Import translations. DO NOT MERGEGeoff Mendal2015-08-0878-447/+264
* | | am 95651c88: am df9104d4: Do not show removed permissions in the UI - frameworkSvet Ganov2015-08-084-3/+12
|\| |
| * | am df9104d4: Do not show removed permissions in the UI - frameworkSvet Ganov2015-08-084-3/+12
| |\|
| | * Do not show removed permissions in the UI - frameworkSvet Ganov2015-08-074-3/+12
* | | am 14595d69: am 0c5d3ddf: Merge "Show warning when touches are being blocked ...Jason Monk2015-08-0712-11/+130
|\| |
| * | am 0c5d3ddf: Merge "Show warning when touches are being blocked by overlays" ...Jason Monk2015-08-0712-11/+130
| |\|
| | * Merge "Show warning when touches are being blocked by overlays" into mnc-devJason Monk2015-08-0712-11/+130
| | |\
| | | * Show warning when touches are being blocked by overlaysJason Monk2015-08-0712-11/+130
* | | | am 60115205: am 51fc8c6e: Merge "Fix string %d insertions" into mnc-devJason Monk2015-08-071-1/+1
|\| | |
| * | | am 51fc8c6e: Merge "Fix string %d insertions" into mnc-devJason Monk2015-08-071-1/+1
| |\| |
| | * | Merge "Fix string %d insertions" into mnc-devJason Monk2015-08-071-1/+1
| | |\ \
| | | * | Fix string %d insertionsJason Monk2015-08-071-1/+1
| | | |/
* | | | am 944851e8: (-s ours) am adaac867: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-070-0/+0
|\| | |
| * | | am adaac867: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-070-0/+0
| |\| |
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-08-0778-83/+239
| | |/
* | | am 3db1c5d4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
|\| |
| * | Import translations. DO NOT MERGEGeoff Mendal2015-08-0578-80/+419
* | | am 8432af0c: am cea90ebd: Add strings for the screen overlay warningSvetoslav2015-08-051-5/+12
|\| |
| * | am cea90ebd: Add strings for the screen overlay warningSvetoslav2015-08-051-5/+12
| |\|
| | * Add strings for the screen overlay warningSvetoslav2015-08-041-5/+12
* | | am 9bbe6853: (-s ours) am b004e34f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-040-0/+0
|\| |
| * | am b004e34f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-040-0/+0
| |\|
| | * Import translations. DO NOT MERGEGeoff Mendal2015-08-0380-194/+241
* | | am 67ea15b8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-030-0/+0
|\| |
| * | Import translations. DO NOT MERGEGeoff Mendal2015-08-031-1/+1
* | | am 24562e32: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-08-010-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-08-0178-36/+96
| |\ \
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-3178-36/+96
* | | | am 070c1aab: am ff4ce409: Merge "Use the new per UID app op APIs for legacy p...Svetoslav Ganov2015-08-011-9/+6
|\| | |
| * | | am ff4ce409: Merge "Use the new per UID app op APIs for legacy permissions." ...Svetoslav Ganov2015-08-011-9/+6
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge "Use the new per UID app op APIs for legacy permissions." into mnc-devSvetoslav Ganov2015-08-011-9/+6
| | |\
| | | * Use the new per UID app op APIs for legacy permissions.Svet Ganov2015-07-311-9/+6
* | | | am 4f28bbab: am 1ff8800d: Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-08-011-1/+1
|\| | |
| * | | am 1ff8800d: Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-311-1/+1
| |\| |
| | * | Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-311-1/+1
| | |\ \
| | | * | Change MNC codename to just M.Dianne Hackborn2015-07-291-1/+1
* | | | | am 53481e2c: am 7741e471: Merge "Add string for screen overlay warning." into...Jason Monk2015-07-291-0/+6
|\| | | |
| * | | | am 7741e471: Merge "Add string for screen overlay warning." into mnc-devJason Monk2015-07-291-0/+6
| |\| | |
| | * | | Merge "Add string for screen overlay warning." into mnc-devJason Monk2015-07-291-0/+6
| | |\ \ \ | | | |/ / | | |/| |