summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4e26f24c: am 20e7c198: am b174fb7c: am 95651c88: am df9104d4: Do not show ...Svet Ganov2015-08-084-3/+12
|\
| * am 20e7c198: am b174fb7c: am 95651c88: am df9104d4: Do not show removed permi...Svet Ganov2015-08-084-3/+12
| |\
| | * am b174fb7c: am 95651c88: am df9104d4: Do not show removed permissions in the...Svet Ganov2015-08-084-3/+12
| | |\
| | | * 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
* | | | | | Fixing the build.Ian Pedowitz2015-08-071-1/+1
* | | | | | resolved conflicts for merge of 4941304f to masterBart Sears2015-08-0712-11/+130
|\| | | | |
| * | | | | am 2b35ed61: am 0ac52fc3: am 14595d69: am 0c5d3ddf: Merge "Show warning when ...Jason Monk2015-08-0712-11/+130
| |\| | | |
| | * | | | am 0ac52fc3: am 14595d69: am 0c5d3ddf: Merge "Show warning when touches are b...Jason Monk2015-08-0712-11/+130
| | |\| | |
| | | * | | 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 edd51396: am 9845cb89: am 778f7d54: am 60115205: am 51fc8c6e: Merge "Fix s...Jason Monk2015-08-071-1/+1
|\| | | | | |
| * | | | | | am 9845cb89: am 778f7d54: am 60115205: am 51fc8c6e: Merge "Fix string %d inse...Jason Monk2015-08-071-1/+1
| |\| | | | |
| | * | | | | am 778f7d54: am 60115205: am 51fc8c6e: Merge "Fix string %d insertions" into ...Jason Monk2015-08-071-1/+1
| | |\| | | |
| | | * | | | 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 fe476eb1: (-s ours) am 26b5a864: (-s ours) am 2a81e46a: (-s ours) am 94485...Geoff Mendal2015-08-070-0/+0
|\| | | | | |
| * | | | | | am 26b5a864: (-s ours) am 2a81e46a: (-s ours) am 944851e8: (-s ours) am adaac...Geoff Mendal2015-08-070-0/+0
| |\| | | | |
| | * | | | | am 2a81e46a: (-s ours) am 944851e8: (-s ours) am adaac867: (-s ours) Import t...Geoff Mendal2015-08-070-0/+0
| | |\| | | |
| | | * | | | 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 0b657094: (-s ours) am 1a9ccb6f: (-s ours) am a95efe39: (-s ours) am 3db1c...Geoff Mendal2015-08-050-0/+0
|\| | | | |
| * | | | | am 1a9ccb6f: (-s ours) am a95efe39: (-s ours) am 3db1c5d4: (-s ours) Import t...Geoff Mendal2015-08-050-0/+0
| |\| | | |
| | * | | | am a95efe39: (-s ours) am 3db1c5d4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| | |\| | |
| | | * | | am 3db1c5d4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| | | |\| |
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-08-0578-80/+419
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0578-80/+419
* | | | | | am 2cca716b: am e163f18f: am 9e129914: am 8432af0c: am cea90ebd: Add strings ...Svetoslav2015-08-051-5/+12
|\| | | | |
| * | | | | am e163f18f: am 9e129914: am 8432af0c: am cea90ebd: Add strings for the scree...Svetoslav2015-08-051-5/+12
| |\| | | |
| | * | | | am 9e129914: am 8432af0c: am cea90ebd: Add strings for the screen overlay war...Svetoslav2015-08-051-5/+12
| | |\| | |
| | | * | | 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 3b7084e4: (-s ours) am 6bc8e30d: (-s ours) am 2e5384bf: (-s ours) am 9bbe6...Geoff Mendal2015-08-040-0/+0
|\| | | | |
| * | | | | am 6bc8e30d: (-s ours) am 2e5384bf: (-s ours) am 9bbe6853: (-s ours) am b004e...Geoff Mendal2015-08-040-0/+0
| |\| | | |
| | * | | | am 2e5384bf: (-s ours) am 9bbe6853: (-s ours) am b004e34f: (-s ours) Import t...Geoff Mendal2015-08-040-0/+0
| | |\| | |
| | | * | | 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 fc7d9b18: (-s ours) am 13d43b72: (-s ours) am 44ba0e72: (-s ours) am 67ea1...Geoff Mendal2015-08-030-0/+0
|\| | | | |
| * | | | | am 13d43b72: (-s ours) am 44ba0e72: (-s ours) am 67ea15b8: (-s ours) Import t...Geoff Mendal2015-08-030-0/+0
| |\| | | |
| | * | | | am 44ba0e72: (-s ours) am 67ea15b8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-030-0/+0
| | |\| | |
| | | * | | am 67ea15b8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-030-0/+0
| | | |\| |
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-08-031-1/+1