summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-2084-697/+2685
|\
| * Import translations. DO NOT MERGEGeoff Mendal2014-10-2084-697/+2685
* | am bdedbb85: Merge "Changing settings UI changes related to strings to be dis...Sanket Padawe2014-10-202-6/+12
|\ \ | |/ |/|
| * Merge "Changing settings UI changes related to strings to be displayed" into ...Sanket Padawe2014-10-202-6/+12
| |\
| | * Changing settings UI changes related to strings to be displayedSanket Padawe2014-10-202-6/+12
* | | am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
|\ \ \ | |/ /
| * | am 25149b38: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-10-1984-798/+3053
* | | | am 456b866c: am aa037675: Fix bad string in EncryptionInterstitialJim Miller2014-10-182-4/+21
|\ \ \ \ | |/ / /
| * | | am aa037675: Fix bad string in EncryptionInterstitialJim Miller2014-10-182-4/+21
| |\ \ \ | | |/ /
| | * | Fix bad string in EncryptionInterstitialJim Miller2014-10-172-4/+21
* | | | am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabledJim Miller2014-10-181-11/+71
|\ \ \ \ | |/ / /
| * | | am 47adff0a: Show warning dialog when Accessibility is enabledJim Miller2014-10-181-11/+71
| |\ \ \ | | |/ /
| | * | Show warning dialog when Accessibility is enabledJim Miller2014-10-171-11/+71
* | | | am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial ...Jim Miller2014-10-176-41/+91
|\ \ \ \ | |/ / /
| * | | am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into...Jim Miller2014-10-176-41/+91
| |\ \ \ | | |/ /
| | * | Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-devJim Miller2014-10-176-41/+91
| | |\ \
| | | * | Several fixes to new EncryptionInterstitial dialog.Jim Miller2014-10-176-41/+91
* | | | | am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong enc...Svetoslav2014-10-172-3/+16
|\ \ \ \ \ | |/ / / /
| * | | | am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Sett...Svetoslav2014-10-172-3/+16
| |\ \ \ \ | | |/ / /
| | * | | Merge "Accessibility no longer overrides strong encryption (Settings)." into ...Svetoslav2014-10-172-3/+16
| | |\ \ \
| | | * | | Accessibility no longer overrides strong encryption (Settings).Svetoslav2014-10-172-3/+16
* | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-172-12/+12
|\ \ \ \ \ \
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-172-12/+12
* | | | | | | am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am e52c159c: Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
| | | |_|/ / | | |/| | |
* | | | | | Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statis...Fabrice Di Meglio2014-10-171-1/+1
|\ \ \ \ \ \
| * | | | | | Fix bug #18024258 Crash in Settings observed after tap on Usage statisticsFabrice Di Meglio2014-10-171-1/+1
* | | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-173-35/+35
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-163-35/+35
* | | | | | | am c7ccba68: am 4f903c3e: Add strings for upcoming change.Jim Miller2014-10-171-3/+30
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 4f903c3e: Add strings for upcoming change.Jim Miller2014-10-171-3/+30
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Add strings for upcoming change.Jim Miller2014-10-171-3/+30
| | | |_|/ / | | |/| | |
* | | | | | am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility ser...Svetoslav2014-10-178-15/+103
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3ea423ae: User to confirm credentials if an accessibility service changes ...Svetoslav2014-10-178-15/+103
| |\ \ \ \ \ | | |/ / / /
| | * | | | User to confirm credentials if an accessibility service changes encryption.Svetoslav2014-10-168-15/+103
* | | | | | Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-devAlan Viverette2014-10-171-2/+3
|\ \ \ \ \ \
| * | | | | | Prevent NPE when no accessibility services are enabledAlan Viverette2014-10-161-2/+3
* | | | | | | Settings: Fix hotspot switch state issue.John Spurlock2014-10-171-0/+1
* | | | | | | Remove excess whitespace from the factory reset screenSami Tolvanen2014-10-161-0/+2
* | | | | | | Merge "Fix bug #18017952 It does not search all possible "USB" results that c...Fabrice Di Meglio2014-10-163-4/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix bug #18017952 It does not search all possible "USB" results that can be f...Fabrice Di Meglio2014-10-163-4/+14
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Materi...Fabrice Di Meglio2014-10-1614-61/+43
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/o...Fabrice Di Meglio2014-10-1514-61/+43
* | | | | | | am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-spr...Geoff Mendal2014-10-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-1678-282/+419
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-1578-282/+419
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO ...Geoff Mendal2014-10-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-160-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |