summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-16101-828/+999
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-15101-828/+999
* | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-16112-2002/+2159
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-15112-2002/+2159
* | | | | | | | am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-devJim Miller2014-10-157-6/+260
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | resolved conflicts for merge of 46c7f6d6 to lmp-sprout-devJim Miller2014-10-157-6/+260
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Add a checkbox option to 'require password to decrypt'Jim Miller2014-10-147-6/+259
| | |/ / /
* | | | | am 6b68b000: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings...Fabrice Di Meglio2014-10-151-3/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment Ap...Fabrice Di Meglio2014-10-151-3/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da...Fabrice Di Meglio2014-10-151-3/+7
| | |\ \ \
| | | * | | Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} n...Fabrice Di Meglio2014-10-141-3/+7
* | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-142-137/+136
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-142-137/+136
* | | | | | am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overvie...Jason Monk2014-10-141-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-devJason Monk2014-10-141-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Update screen pinning strings to say Overview" into lmp-devJason Monk2014-10-141-1/+1
| | |\ \ \ \
| | | * | | | Update screen pinning strings to say OverviewJason Monk2014-10-141-1/+1
| | | | |/ / | | | |/| |
* | | | | | am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into ...Andres Morales2014-10-141-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-devAndres Morales2014-10-141-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Set layout_width in WiFi+NFC resource" into lmp-devAndres Morales2014-10-141-0/+2
| | |\ \ \ \
| | | * | | | Set layout_width in WiFi+NFC resourceAndres Morales2014-10-141-0/+2
* | | | | | | am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is...vandwalle2014-10-141-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2fb9c773: Merge "dont show a config in saved network if it is self added a...vandwalle2014-10-141-1/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "dont show a config in saved network if it is self added and we never c...vandwalle2014-10-141-1/+5
| | |\ \ \ \ \
| | | * | | | | dont show a config in saved network if it is self added and we never connecte...vandwalle2014-10-131-1/+5
| | | | |/ / / | | | |/| | |
* | | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-142-16/+15
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-132-16/+15
* | | | | | | Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-devJohn Spurlock2014-10-141-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Settings: Restart existing volumizers in volume prefs.John Spurlock2014-10-131-0/+1
* | | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-132-10/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-132-10/+10
* | | | | | | am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO ...Geoff Mendal2014-10-130-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-130-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-13112-1302/+1150
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-13112-1302/+1150
| | | | |_|/ / | | | |/| | |
* | | | | | | am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-spr...Geoff Mendal2014-10-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-1386-646/+528
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-1386-646/+528
* | | | | | | | am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL ...John Spurlock2014-10-131-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.John Spurlock2014-10-131-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Fix battery-history-chart large-mode labels in RTL layouts.John Spurlock2014-10-131-0/+3
| | |/ / / /
* | | | | | Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-devAlan Viverette2014-10-1316-18/+19
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update Settings to use themed Context.getDrawable()Alan Viverette2014-10-1016-18/+19
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-1396-1068/+740
| |_|_|/ / |/| | | |
* | | | | am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning fo...Alan Viverette2014-10-111-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-devAlan Viverette2014-10-111-2/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Add option for serif monospace captioning font" into lmp-devAlan Viverette2014-10-101-2/+4
| | |\ \ \
| | | * | | Add option for serif monospace captioning fontAlan Viverette2014-10-101-2/+4
| | | | |/ | | | |/|
* | | | | am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-devAmit Mahajan2014-10-110-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 88b2790d to lmp-sprout-devAmit Mahajan2014-10-100-0/+0
| |\ \ \ \ | | |/ / /