summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-1935-212/+132
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-1835-212/+132
* | | | | | | | | | | | | am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop ...Paul Lawrence2015-09-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into...Paul Lawrence2015-09-191-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Revert "Remove don't kill flag from CryptKeeper to stop logspam"Paul Lawrence2015-09-191-1/+2
* | | | | | | | | | | | | | am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into m...Jim Miller2015-09-192-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-devJim Miller2015-09-192-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add summary for 0 fingerprint settings preferenceJim Miller2015-09-182-0/+4
* | | | | | | | | | | | | | | am c6a96d40: Merge "Add color transform setting" into mnc-dr-devJustin Harrison2015-09-197-2/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Add color transform setting" into mnc-dr-devJustin Harrison2015-09-197-2/+255
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add color transform settingJason Monk2015-09-187-2/+255
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc...Adam Lesinski2015-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-devAdam Lesinski2015-09-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Update implementation to match BatteryStats.UidAdam Lesinski2015-09-061-1/+1
* | | | | | | | | | | | | | | am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-devPaul Lawrence2015-09-182-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-devPaul Lawrence2015-09-182-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Stop long passwords crashing CryptKeeperPaul Lawrence2015-09-162-0/+2
* | | | | | | | | | | | | | | | am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam"...Paul Lawrence2015-09-181-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-devPaul Lawrence2015-09-181-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | / / / / / / / / / / / | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Remove don't kill flag from CryptKeeper to stop logspamPaul Lawrence2015-09-141-2/+1
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-1562-622/+312
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-1462-622/+312
* | | | | | | | | | | | | | | am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning checkHyejin2015-09-152-22/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix IndexOutOfBoundsException while silent provisioning checkHyejin2015-09-142-22/+38
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity w...Selim Cinek2015-09-121-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twic...Selim Cinek2015-09-121-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.Selim Cinek2015-09-111-2/+13
* | | | | | | | | | | | | | | am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into...Jorim Jaggi2015-09-111-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-devJorim Jaggi2015-09-111-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add timeout if we dont get onEnterAnimationCompleteJorim Jaggi2015-09-111-0/+15
* | | | | | | | | | | | | | | | am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential im...Jorim Jaggi2015-09-113-20/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" in...Jorim Jaggi2015-09-113-20/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Finish trampoline activity for ConfirmDeviceCredential immediatelyJorim Jaggi2015-09-103-20/+18
* | | | | | | | | | | | | | | am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 1538dde4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-1018-393/+393
* | | | | | | | | | | | | | | am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-1178-309/+1089
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-1078-309/+1089
* | | | | | | | | | | | | | | | am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker ...Jorim Jaggi2015-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" int...Jorim Jaggi2015-09-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix crash in when restoring CredentialCheckResultTracker FragmentJorim Jaggi2015-09-101-1/+1
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | am d3c60afe: Include the usb data mode regardless of data roleJason Monk2015-09-101-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Include the usb data mode regardless of data roleJason Monk2015-09-101-2/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-...Jorim Jaggi2015-09-103-1/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Add double-tap power button to open camera 2/2" into mnc-dr-devJorim Jaggi2015-09-103-1/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add double-tap power button to open camera 2/2Jorim Jaggi2015-09-093-1/+44
* | | | | | | | | | | | | | | am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger...Jim Miller2015-09-096-23/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Handle fp enrollment errors more gracefully - When finger can't be ana...Jim Miller2015-09-096-23/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |