summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-06-2977-31/+96
* am e34c9a7f: am af795c89: am 1cc22115: Merge "Fix tinting on bitmap perm icon...Jason Monk2015-06-251-1/+1
|\
| * am af795c89: am 1cc22115: Merge "Fix tinting on bitmap perm icons" into mnc-devJason Monk2015-06-251-1/+1
| |\
| | * am 1cc22115: Merge "Fix tinting on bitmap perm icons" into mnc-devJason Monk2015-06-251-1/+1
| | |\
| | | * Merge "Fix tinting on bitmap perm icons" into mnc-devJason Monk2015-06-251-1/+1
| | | |\
| | | | * Fix tinting on bitmap perm iconsJason Monk2015-06-241-1/+1
* | | | | am 9255138f: am ec4b8bf0: am e26f2269: Merge "Make ManagePermissionsFragment ...Todd Volkert2015-06-246-3/+88
|\| | | |
| * | | | am ec4b8bf0: am e26f2269: Merge "Make ManagePermissionsFragment more TV-frien...Todd Volkert2015-06-246-3/+88
| |\| | |
| | * | | am e26f2269: Merge "Make ManagePermissionsFragment more TV-friendly." into mn...Todd Volkert2015-06-246-3/+88
| | |\| |
| | | * | Merge "Make ManagePermissionsFragment more TV-friendly." into mnc-devTodd Volkert2015-06-246-3/+88
| | | |\ \
| | | | * | Make ManagePermissionsFragment more TV-friendly.Todd Volkert2015-06-236-3/+88
* | | | | | am eb67e8df: (-s ours) am 619f7b96: (-s ours) am 41f70997: (-s ours) Import t...Geoff Mendal2015-06-240-0/+0
|\| | | | |
| * | | | | am 619f7b96: (-s ours) am 41f70997: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-240-0/+0
| |\| | | |
| | * | | | am 41f70997: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-240-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-06-2477-124/+147
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-2477-124/+147
* | | | | | am 4f69eb0d: am ecac350e: am d0e82304: Merge "Fix issue #21945272: Crash in A...Dianne Hackborn2015-06-241-8/+17
|\| | | | |
| * | | | | am ecac350e: am d0e82304: Merge "Fix issue #21945272: Crash in Activity.dispa...Dianne Hackborn2015-06-231-8/+17
| |\| | | |
| | * | | | am d0e82304: Merge "Fix issue #21945272: Crash in Activity.dispatchRequestPer...Dianne Hackborn2015-06-231-8/+17
| | |\| | |
| | | * | | Merge "Fix issue #21945272: Crash in Activity.dispatchRequestPermissionsResul...Dianne Hackborn2015-06-231-8/+17
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix issue #21945272: Crash in Activity.dispatchRequestPermissionsResultDianne Hackborn2015-06-231-8/+17
* | | | | | am 68207ef5: am c07902e0: am 4e834af0: Merge "Use icon as background image in...Todd Volkert2015-06-231-1/+3
|\| | | | |
| * | | | | am c07902e0: am 4e834af0: Merge "Use icon as background image instead of main...Todd Volkert2015-06-231-1/+3
| |\| | | |
| | * | | | am 4e834af0: Merge "Use icon as background image instead of main image." into...Todd Volkert2015-06-231-1/+3
| | |\| | |
| | | * | | Merge "Use icon as background image instead of main image." into mnc-devTodd Volkert2015-06-231-1/+3
| | | |\ \ \
| | | | * | | Use icon as background image instead of main image.Todd Volkert2015-06-231-1/+3
| | | | |/ /
* | | | | | am eb33f0d4: am f809ed4c: am ed16fb4e: Merge "Mark permissions that are auto ...Amith Yamasani2015-06-233-0/+23
|\| | | | |
| * | | | | am f809ed4c: am ed16fb4e: Merge "Mark permissions that are auto granted/revok...Amith Yamasani2015-06-233-0/+23
| |\| | | |
| | * | | | am ed16fb4e: Merge "Mark permissions that are auto granted/revoked as policy_...Amith Yamasani2015-06-233-0/+23
| | |\| | |
| | | * | | Merge "Mark permissions that are auto granted/revoked as policy_fixed" into m...Amith Yamasani2015-06-233-0/+23
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Mark permissions that are auto granted/revoked as policy_fixedAmith Yamasani2015-06-233-0/+23
* | | | | | am 1db097ed: am ad6b812e: am 6304bd34: Merge "Only show the header on non-tel...Todd Volkert2015-06-231-3/+7
|\| | | | |
| * | | | | am ad6b812e: am 6304bd34: Merge "Only show the header on non-television ui mo...Todd Volkert2015-06-231-3/+7
| |\| | | |
| | * | | | am 6304bd34: Merge "Only show the header on non-television ui modes." into mn...Todd Volkert2015-06-231-3/+7
| | |\| | |
| | | * | | Merge "Only show the header on non-television ui modes." into mnc-devTodd Volkert2015-06-231-3/+7
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Only show the header on non-television ui modes.Todd Volkert2015-06-231-3/+7
* | | | | | am 8e5e71fe: am cc3b940f: am 8b664cac: Fix app count on App PermissionsMakoto Onuki2015-06-231-0/+1
|\| | | | |
| * | | | | am cc3b940f: am 8b664cac: Fix app count on App PermissionsMakoto Onuki2015-06-231-0/+1
| |\| | | |
| | * | | | am 8b664cac: Fix app count on App PermissionsMakoto Onuki2015-06-221-0/+1
| | |\| | |
| | | * | | Fix app count on App PermissionsMakoto Onuki2015-06-221-0/+1
* | | | | | am bd1b0af3: am 15612603: am cfa9d13d: Merge "Don\'t let preferences change s...Jason Monk2015-06-221-0/+2
|\| | | | |
| * | | | | am 15612603: am cfa9d13d: Merge "Don\'t let preferences change size on load" ...Jason Monk2015-06-221-0/+2
| |\| | | |
| | * | | | am cfa9d13d: Merge "Don\'t let preferences change size on load" into mnc-devJason Monk2015-06-221-0/+2
| | |\| | |
| | | * | | Merge "Don't let preferences change size on load" into mnc-devJason Monk2015-06-221-0/+2
| | | |\ \ \
| | | | * | | Don't let preferences change size on loadJason Monk2015-06-221-0/+2
| | | | | |/ | | | | |/|
* | | | | | am 63c908de: am ed494745: am 5eddce8d: Merge "Use vertically stacked buttons ...Jason Monk2015-06-222-9/+22
|\| | | | |
| * | | | | am ed494745: am 5eddce8d: Merge "Use vertically stacked buttons when we don\'...Jason Monk2015-06-222-9/+22
| |\| | | |
| | * | | | am 5eddce8d: Merge "Use vertically stacked buttons when we don\'t have space"...Jason Monk2015-06-222-9/+22
| | |\| | |
| | | * | | Merge "Use vertically stacked buttons when we don't have space" into mnc-devJason Monk2015-06-222-9/+22
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Use vertically stacked buttons when we don't have spaceJason Monk2015-06-222-9/+22
| | | | |/