summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-130-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-100-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-080-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-060-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-030-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-020-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-230-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-210-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-100-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-070-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-040-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | |/ | | | | | | | | | | | | |/|
| | | | | | | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2016-02-010-0/+0
| | | | | | | | | | | | |\|
| | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-260-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-240-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-210-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-170-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-140-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-070-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-060-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-050-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-240-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-03-111-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-03-101-4/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b31dbf28315278d7482b4550fa1eca0dce367fd Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't crash installer" into nyc-devTodd Kennedy2016-03-111-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash installerTodd Kennedy2016-03-101-0/+8
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting the installer without a URI, it would crash. Don't do that. Bug: 26450627 Change-Id: I2b0d452c12c0fc695326200617c5284f60a9e45b
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Tweak strings when uninstalling updatesAmith Yamasani2016-03-092-4/+19
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inform about data deletion and also about other users. Bug: 26694521 Change-Id: Ib1ab8ca58e111cfbad6895f296e567e289ce34d8
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2016-03-0979-316/+158
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I396361b52187a01ce702759c154e771f34228489 Auto-generated-cl: translation import
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2016-03-0780-183/+452
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I37168273324f9bed34bd85425a0be69825b54832 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Support app install from a content URI" into nyc-devSvetoslav Ganov2016-03-0621-90/+254
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support app install from a content URISvet Ganov2016-03-0521-90/+254
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:24079113 Change-Id: Ide1aa1667370f6b8d00ff269ef28992589656e9a
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update restricted icon position in RestrictedSwitchPreference." into ↵Sudheer Shanka2016-03-032-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-dev
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update restricted icon position in RestrictedSwitchPreference.Sudheer Shanka2016-03-022-6/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fixed a bug where the admin disabled summary is shown even if the admin has not set a permission policy. Bug: 25603665 Bug: 27263775 Change-Id: I8cbbc4c326669a656ad5aef53896b388d556a74f
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix confirm button text when revoking special permissons" into nyc-devSvetoslav Ganov2016-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix confirm button text when revoking special permissonsSvet Ganov2016-03-021-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23899558 Change-Id: Ic40994d5a74f726d0a7bc5f0f476b62f114fd18f
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-03-0280-102/+281
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c8b57174dd1580196bda7bbfff6e9a46d23178e Auto-generated-cl: translation import