summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric...Maurice Lam2014-11-264-55/+203
|\
| * am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wi...Maurice Lam2014-11-264-55/+203
| |\
| | * Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-devMaurice Lam2014-11-264-55/+203
| | |\
| | | * [Setup] Theme ChooseLockGeneric for setup wizardMaurice Lam2014-11-254-55/+203
| | * | Merge "IllegalStateException fixed in print service settings" into lmp-mr1-devFabrice Di Meglio2014-11-261-3/+8
| | |\ \
| | | * | IllegalStateException fixed in print service settingsRaju Yadav2014-11-251-3/+8
* | | | | am d5a4dae8: am c5aa905a: Merge "IllegalStateException fixed in print service...Fabrice Di Meglio2014-11-251-3/+8
|\ \ \ \ \ | |/ / / /
| * | | | am c5aa905a: Merge "IllegalStateException fixed in print service settings"Fabrice Di Meglio2014-11-251-3/+8
| |\ \ \ \
| | * | | | IllegalStateException fixed in print service settingsRaju Yadav2014-11-251-3/+8
* | | | | | am 9fc6bf3f: am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstiti...Adrian Roos2014-11-252-2/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when chang...Adrian Roos2014-11-252-2/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-devAdrian Roos2014-11-252-2/+9
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Don't show RedactionInterstitial when changing passwordAdrian Roos2014-11-242-2/+9
* | | | | | am 1abdd7c9: am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts befor...Paul Crowley2014-11-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory res...Paul Crowley2014-11-251-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-devPaul Crowley2014-11-241-1/+1
| | |\ \ \ \
| | | * | | | Reduce number of attempts before factory reset to 30.Paul Crowley2014-11-211-1/+1
* | | | | | | am 51a36c67: am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api...Selim Cinek2014-11-251-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." int...Selim Cinek2014-11-251-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fixed build breakage due to api change." into lmp-mr1-devSelim Cinek2014-11-241-1/+2
| | |\ \ \ \ \
| | | * | | | | Fixed build breakage due to api change.Selim Cinek2014-11-241-1/+2
| | | | |_|_|/ | | | |/| | |
* | | | | | | am 7a2e5f1b: am 4a30d627: am 6ad85792: Merge "Stop background processes if Tr...Zoltan Szatmary-Ban2014-11-251-1/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredenti...Zoltan Szatmary-Ban2014-11-251-1/+27
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Stop background processes if TrustedCredentialSettings fragment gets d...Zoltan Szatmary-Ban2014-11-241-1/+27
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Stop background processes if TrustedCredentialSettings fragment gets detachedZoltan Szatmary-Ban2014-11-181-1/+27
| | | |/ / /
* | | | | | am c1ded7e2: am fd0c6eb5: am 239d185a: Merge "Additional changes to Subscript...Wink Saville2014-11-248-88/+103
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager AP...Wink Saville2014-11-248-88/+103
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Additional changes to SubscriptionManager API as per API council." int...Wink Saville2014-11-228-88/+103
| | |\ \ \ \
| | | * | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-228-88/+103
* | | | | | | am 8b2c19b5: am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to ...Lajos Molnar2014-11-241-8/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePl...Lajos Molnar2014-11-241-8/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Reword NuPlayer developer settings to say AwesomePlayerLajos Molnar2014-11-211-8/+8
* | | | | | | am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warnin...Andres Morales2014-11-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-m...Andres Morales2014-11-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Update enable oem unlock warning" into lmp-mr1-devAndres Morales2014-11-221-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Update enable oem unlock warningAndres Morales2014-11-211-1/+1
| | | |/ / /
* | | | | | am 0d9fece9: am eb7795ed: Merge "Use shortFormat instead of shortFormat4."Narayan Kamath2014-11-241-3/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am eb7795ed: Merge "Use shortFormat instead of shortFormat4."Narayan Kamath2014-11-241-3/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Use shortFormat instead of shortFormat4.Narayan Kamath2014-11-181-3/+2
* | | | | am ed98052c: am db494098: am 9209ce85: Merge "Changing sim selection dialog i...Sanket Padawe2014-11-221-4/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Changing sim selection dialog in Settings to use phoneAccount" into lm...Sanket Padawe2014-11-211-4/+19
| |\ \ \ \
| | * | | | Changing sim selection dialog in Settings to use phoneAccountSanket Padawe2014-11-191-4/+19
| | | |/ / | | |/| |
* | | | | am 3da30aab: am 208a8490: am 5875aefa: Merge "Remove backup preferences if ba...Zoltan Szatmary-Ban2014-11-211-9/+55
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-devZoltan Szatmary-Ban2014-11-211-9/+55
| |\ \ \ \
| | * | | | Remove backup preferences if backup service is inactiveZoltan Szatmary-Ban2014-11-201-9/+55
* | | | | | am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting asyn...Amith Yamasani2014-11-213-73/+87
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Watch out for deleted user when exiting async task" into lmp-mr1-devAmith Yamasani2014-11-213-73/+87
| |\ \ \ \ \
| | * | | | | Watch out for deleted user when exiting async taskAmith Yamasani2014-11-203-73/+87
| | | |/ / / | | |/| | |
* | | | | | am 14d486de: am b9b69faf: Merge "Revert "Additional changes to SubscriptionMa...Wink Saville2014-11-218-89/+82
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Revert "Additional changes to SubscriptionManager API as per API counc...Wink Saville2014-11-208-89/+82
| |\ \ \ \ \