summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importcm-14.1_prerebaseAbhisek Devkota2017-02-111-0/+118
* Automatic translation importAbhisek Devkota2017-02-0418-18/+0
* Automatic translation importpinky@build012016-12-2418-0/+18
* Merge tag 'android-7.1.1_r4' into cm-14.1Dan Pasanen2016-12-053-2/+6
|\
| * Merge "Adding encryption aware matcher flags to install shortcut disabling" i...Benjamin Franz2016-09-011-1/+3
| |\
| | * Adding encryption aware matcher flags to install shortcut disablingBenjamin Franz2016-08-231-1/+3
| * | Merge "Configure code coverage filter." into nyc-mr1-devAllen Hair2016-08-261-0/+2
| |\ \ | | |/ | |/|
| | * Configure code coverage filter.Allen Hair2016-08-251-0/+2
| * | Import translations. DO NOT MERGEBill Yi2016-08-191-1/+1
* | | Automatic translation importinky@build012016-11-2218-0/+2175
* | | Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/pac...Steve Kondik2016-10-2530-253/+124
|\ \ \
| * \ \ merge in nyc-dr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-270-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in nyc-dr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-150-0/+0
| | |\ \
| | | * \ merge in nyc-dr1-release history after reset to nyc-mr1-devThe Android Automerger2016-07-070-0/+0
| | | |\ \ | | | |/ / | | |/| |
| * | | | Import translations. DO NOT MERGEBill Yi2016-07-206-35/+24
| | |_|/ | |/| |
| * | | Add phone required package to device/user whitelistEsteban Talavera2016-07-152-0/+2
| |/ /
| * / Shouldn't escape provisioning if setup incomplete.Mahaver Chopra2016-06-281-5/+19
| |/
| * findDeviceAdmin searchs for disable receiver as wellTony Mak2016-06-091-2/+2
| |\
| * \ Run WebActivity in separate processTony Mak2016-06-081-0/+1
| |\ \
| * \ \ Import translations. DO NOT MERGEBill Yi2016-06-030-0/+0
| |\ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2016-06-037-17/+17
| * | | | Update ManagedProvisioning to the new setup wizard library.Nicolas Prevot2016-05-3124-238/+93
| * | | | Merge "Use the file path provided by the DownloadManager in ManagedProvisioni...Nicolas Prevot2016-05-311-3/+14
| |\ \ \ \
| * \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-05-230-0/+0
| |\ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2016-05-235-18/+18
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-220-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-180-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBaligh Uddin2016-05-186-39/+39
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-166-39/+39
| * | | | | | | | | Use StorageManager.isEncrypted() to determine if device is encryptibleRicky Wai2016-05-181-12/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-05-100-0/+0
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-05-094-7/+4
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot2016-05-0678-78/+81
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-05-0678-78/+81
| * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-05-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Configure default managed profile setting in managed provisioning" int...Tony Mak2016-05-042-1/+44
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Update managed profile privacy notice about work contacts" into nyc-devRicky Wai2016-05-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBaligh Uddin2016-04-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-04-261-1/+1
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-271-1/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix checking for supported launcher in ManagedProvisioningMichal Karpinski2016-04-201-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBaligh Uddin2016-04-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | |