Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Baligh Uddin | 2015-09-19 | 35 | -212/+132 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-18 | 35 | -212/+132 | |
* | | | | | | | | | | | | | am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop ... | Paul Lawrence | 2015-09-19 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into... | Paul Lawrence | 2015-09-19 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Revert "Remove don't kill flag from CryptKeeper to stop logspam" | Paul Lawrence | 2015-09-19 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into m... | Jim Miller | 2015-09-19 | 2 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev | Jim Miller | 2015-09-19 | 2 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Add summary for 0 fingerprint settings preference | Jim Miller | 2015-09-18 | 2 | -0/+4 | |
* | | | | | | | | | | | | | | | am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev | Justin Harrison | 2015-09-19 | 7 | -2/+255 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Add color transform setting" into mnc-dr-dev | Justin Harrison | 2015-09-19 | 7 | -2/+255 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Add color transform setting | Jason Monk | 2015-09-18 | 7 | -2/+255 | |
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc... | Adam Lesinski | 2015-09-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev | Adam Lesinski | 2015-09-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Update implementation to match BatteryStats.Uid | Adam Lesinski | 2015-09-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev | Paul Lawrence | 2015-09-18 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev | Paul Lawrence | 2015-09-18 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Stop long passwords crashing CryptKeeper | Paul Lawrence | 2015-09-16 | 2 | -0/+2 | |
* | | | | | | | | | | | | | | | | am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam"... | Paul Lawrence | 2015-09-18 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev | Paul Lawrence | 2015-09-18 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | / / / / / / / / / / / | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Remove don't kill flag from CryptKeeper to stop logspam | Paul Lawrence | 2015-09-14 | 1 | -2/+1 | |
| | |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Baligh Uddin | 2015-09-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Baligh Uddin | 2015-09-15 | 62 | -622/+312 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-14 | 62 | -622/+312 | |
* | | | | | | | | | | | | | | | am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check | Hyejin | 2015-09-15 | 2 | -22/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Fix IndexOutOfBoundsException while silent provisioning check | Hyejin | 2015-09-14 | 2 | -22/+38 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity w... | Selim Cinek | 2015-09-12 | 1 | -2/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twic... | Selim Cinek | 2015-09-12 | 1 | -2/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Fixed a bug where the ConfirmDeviceCredentials activity was shown twice. | Selim Cinek | 2015-09-11 | 1 | -2/+13 | |
* | | | | | | | | | | | | | | | am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into... | Jorim Jaggi | 2015-09-11 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev | Jorim Jaggi | 2015-09-11 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Add timeout if we dont get onEnterAnimationComplete | Jorim Jaggi | 2015-09-11 | 1 | -0/+15 | |
* | | | | | | | | | | | | | | | | am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential im... | Jorim Jaggi | 2015-09-11 | 3 | -20/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" in... | Jorim Jaggi | 2015-09-11 | 3 | -20/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Finish trampoline activity for ConfirmDeviceCredential immediately | Jorim Jaggi | 2015-09-10 | 3 | -20/+18 | |
* | | | | | | | | | | | | | | | am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 1538dde4: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-10 | 18 | -393/+393 | |
* | | | | | | | | | | | | | | | am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Baligh Uddin | 2015-09-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Baligh Uddin | 2015-09-11 | 78 | -309/+1089 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-10 | 78 | -309/+1089 | |
* | | | | | | | | | | | | | | | | am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker ... | Jorim Jaggi | 2015-09-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" int... | Jorim Jaggi | 2015-09-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Fix crash in when restoring CredentialCheckResultTracker Fragment | Jorim Jaggi | 2015-09-10 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | am d3c60afe: Include the usb data mode regardless of data role | Jason Monk | 2015-09-10 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Include the usb data mode regardless of data role | Jason Monk | 2015-09-10 | 1 | -2/+1 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-... | Jorim Jaggi | 2015-09-10 | 3 | -1/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev | Jorim Jaggi | 2015-09-10 | 3 | -1/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Add double-tap power button to open camera 2/2 | Jorim Jaggi | 2015-09-09 | 3 | -1/+44 | |
* | | | | | | | | | | | | | | | am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger... | Jim Miller | 2015-09-09 | 6 | -23/+104 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Handle fp enrollment errors more gracefully - When finger can't be ana... | Jim Miller | 2015-09-09 | 6 | -23/+104 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |