summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-1085-7058/+528
|\
| * Import translations. DO NOT MERGE am: 118159ccbb -s oursGeoff Mendal2015-11-050-0/+0
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-11-050-0/+0
| | |\
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-11-042-9/+9
| * | | Import translations. DO NOT MERGE am: ebd4809777 -s oursGeoff Mendal2015-10-260-0/+0
| |\| |
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-10-260-0/+0
| | |\|
| * | | Import translations. DO NOT MERGE am: f9ebdecf70 -s oursGeoff Mendal2015-10-210-0/+0
| |\| |
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-10-210-0/+0
| | |\ \
| * | | | am 8a58c891: (-s ours) Import translations. DO NOT MERGE am: f995238167 -s oursGeoff Mendal2015-10-190-0/+0
| |\| | |
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-10-190-0/+0
| | |\ \ \
| * | | | | am 05089ad7: am af5df64e: Add Usage and Diagnostics to main screenTony Mantler2015-10-144-1/+22
| |\| | | |
| | * | | | am af5df64e: Add Usage and Diagnostics to main screenTony Mantler2015-10-144-1/+22
| | |\ \ \ \
| * | | | | | am 49728d83: am cba60bd0: Fix NPE in storage migration settingsTony Mantler2015-10-081-1/+3
| |\| | | | |
| | * | | | | am cba60bd0: Fix NPE in storage migration settingsTony Mantler2015-10-081-1/+3
| | |\ \ \ \ \
| * | | | | | | am 811a9192: (-s ours) am 5d9ea974: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| |\| | | | | |
| | * | | | | | am 5d9ea974: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | |\ \ \ \ \ \
| * | | | | | | | am 5052964b: (-s ours) am 211c2fa6: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\| | | | | | |
| | * | | | | | | am 211c2fa6: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ \ \ \ \ \ \
| * | | | | | | | | am 5696af15: (-s ours) am 470536f8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| |\| | | | | | | |
| | * | | | | | | | am 470536f8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | am 3a67ec08: (-s ours) am 6691a9f9: (-s ours) am f7509e86: (-s ours) Import t...Baligh Uddin2015-09-150-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | am 6691a9f9: (-s ours) am f7509e86: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-150-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am d2e8f602: (-s ours) am 577bf535: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-09-020-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | am 577bf535: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-09-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am 968879e1: am 16b83b90: am 4f6ffab4: Allow restricted profile to use locationTony Mantler2015-09-011-3/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 16b83b90: am 4f6ffab4: Allow restricted profile to use locationTony Mantler2015-09-011-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am ea29486b: (-s ours) am 065772fb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-310-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 065772fb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | am 6bc1e3b8: (-s ours) am 7dd595d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-290-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am 7dd595d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am bc8d305c: (-s ours) am 30e4155c: (-s ours) am 617b6133: (-s ours) Import t...Geoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 30e4155c: (-s ours) am 617b6133: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am 560cf6e0: am e4200126: am 6d951a21: Add security patch level to about screenTony Mantler2015-08-262-0/+25
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am e4200126: am 6d951a21: Add security patch level to about screenTony Mantler2015-08-262-0/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | am 82e542b2: am 702569ad: am 0bfaa3c0: Add conditional entry to Google SettingsTony Mantler2015-07-293-8/+44
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 702569ad: am 0bfaa3c0: Add conditional entry to Google SettingsTony Mantler2015-07-293-8/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | am f52151ba: am 69f54607: am 718a802d: Add confirmation dialog for restartingTony Mantler2015-07-211-2/+55
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 69f54607: am 718a802d: Add confirmation dialog for restartingTony Mantler2015-07-211-2/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | am a3f94e94: (-s ours) am 82184f98: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am 82184f98: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am 581c72be: (-s ours) am 2cb24d80: (-s ours) am c5b82536: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am 2cb24d80: (-s ours) am c5b82536: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | am 662d4490: am 521347a5: am ce153428: Merge "Scan storage volumes post-setup...Tony Mantler2015-07-152-0/+48
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am 521347a5: am ce153428: Merge "Scan storage volumes post-setup" into mnc-devTony Mantler2015-07-152-0/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am 76fb1bbf: am 3c82f36a: am 7caeee24: Merge "Don\'t show storage pop-up if s...Tony Mantler2015-07-151-0/+7
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 3c82f36a: am 7caeee24: Merge "Don\'t show storage pop-up if setup is not c...Tony Mantler2015-07-151-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am 9e12b62f: (-s ours) am 8ba484dc: (-s ours) am 8d4f4ba8: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 8ba484dc: (-s ours) am 8d4f4ba8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | am c40de3b3: (-s ours) am 7a0e7407: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 7a0e7407: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \