summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devstaging/cm-14.0cm-14.0The Android Automerger2016-06-120-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-090-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-050-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-010-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-240-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-230-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-190-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-110-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-080-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-050-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-040-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-260-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-210-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-200-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-170-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-100-0/+0
| | | | | | | | | | | | | | | |\|
| | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-070-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-050-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-030-0/+0
| | | | | | | | | | | | | | | | | | |\|
| | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-310-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-290-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-270-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * Deprecate the use of package name in Profile owner creation flowSteven Ng2016-03-213-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Replace the use of deviceAdminPackageName with deviceAdminComponentName.getPackageName() because, in the profile owner provisioning, the device admin app must be installed. Even only if the package name is provided, the device component name can be inferred by the package name via PackageManager. Bug: 27743708 Change-Id: I4b84c3c899a7a204b2e10ff57e4e75e7191f0340
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-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-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-240-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-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\