Baligh Uddin
dbb2c3bd4d
am 52fe489f: (-s ours) am b9aaf9b2: (-s ours) am fdb277f0: (-s ours) am 2d0db309: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '52fe489f24c67628fbe9c1995f765309f7043cef':
Import translations. DO NOT MERGE
2015-09-19 18:15:30 +00:00
Paul Lawrence
3218e63fe1
am e3d813ee: am d1edd531: am 57ca15e4: am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
...
* commit 'e3d813eef88bfeb47fc58e0e9e4adcaa6600229f':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 18:15:28 +00:00
Jim Miller
e2fb8f1d81
am 93fd2b5c: am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit '93fd2b5c3010b17be5391a1e0ae755e31ec9852c':
Add summary for 0 fingerprint settings preference
2015-09-19 18:15:05 +00:00
Justin Harrison
c591cdd69b
am fa9d8258: am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
Add color transform setting
2015-09-19 18:14:36 +00:00
Adam Lesinski
6396e0df2f
am c62f8ea2: am 0896a2e5: am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit 'c62f8ea2346e3cabe0d0c64c6137793aa78d2764':
Update implementation to match BatteryStats.Uid
2015-09-19 18:14:32 +00:00
Paul Lawrence
ae4a557a3f
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
...
This reverts commit 4f60679b76b33741fce7
2015-09-19 17:31:08 +00:00
Baligh Uddin
52fe489f24
am b9aaf9b2: (-s ours) am fdb277f0: (-s ours) am 2d0db309: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'b9aaf9b2717f714b218f273bc95bf5b6edf76b74':
Import translations. DO NOT MERGE
2015-09-19 02:57:00 +00:00
Paul Lawrence
e3d813eef8
am d1edd531: am 57ca15e4: am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
...
* commit 'd1edd5318b46de5f4d28dca1954886660e05b972':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:56:58 +00:00
Baligh Uddin
b9aaf9b271
am fdb277f0: (-s ours) am 2d0db309: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'fdb277f08176de59246664396d164cd95d2c6878':
Import translations. DO NOT MERGE
2015-09-19 02:49:01 +00:00
Paul Lawrence
d1edd5318b
am 57ca15e4: am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
...
* commit '57ca15e45e2bac389d77173084b91de2551dc407':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:49:00 +00:00
Baligh Uddin
fdb277f081
am 2d0db309: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2d0db3098ebdbe20a0cbe4a8afc7b8e593317d3b':
Import translations. DO NOT MERGE
2015-09-19 02:41:25 +00:00
Paul Lawrence
57ca15e45e
am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
...
* commit '0f1e7bfe19f2ca7598399712adaedf5acefcfb0b':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:41:22 +00:00
Baligh Uddin
2d0db3098e
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-19 02:35:07 +00:00
Paul Lawrence
0f1e7bfe19
Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
2015-09-19 02:32:23 +00:00
Paul Lawrence
b33741fce7
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
...
This reverts commit 4f60679b76
2015-09-19 02:29:37 +00:00
Jim Miller
93fd2b5c30
am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit '2b6208599d5cd606cc3a685f6ae3d5b9acf5553b':
Add summary for 0 fingerprint settings preference
2015-09-19 01:22:40 +00:00
Jim Miller
2b6208599d
am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit '50ee327fb9606fdc89df9e00558231692951aa90':
Add summary for 0 fingerprint settings preference
2015-09-19 01:13:26 +00:00
Jim Miller
50ee327fb9
am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit 'd251fed3ef24b02697a375bf32f382338f500f53':
Add summary for 0 fingerprint settings preference
2015-09-19 01:08:31 +00:00
Jim Miller
d251fed3ef
Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
2015-09-19 00:59:51 +00:00
Justin Harrison
fa9d8258d4
am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
Add color transform setting
2015-09-19 00:46:06 +00:00
Adam Lesinski
c62f8ea234
am 0896a2e5: am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '0896a2e545f88785c2a07a4de91d4f5ea67c1a57':
Update implementation to match BatteryStats.Uid
2015-09-19 00:46:05 +00:00
Justin Harrison
8a44f2c413
am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'a3add1d2086f82c8d176ca0a72a7cbd8b98c19ff':
Add color transform setting
2015-09-19 00:37:40 +00:00
Justin Harrison
a3add1d208
am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'c6a96d4076ecddce57c864683a47e581ca2517f5':
Add color transform setting
2015-09-19 00:29:31 +00:00
Justin Harrison
c6a96d4076
Merge "Add color transform setting" into mnc-dr-dev
2015-09-19 00:21:45 +00:00
Adam Lesinski
1f78f774ca
Update implementation to match BatteryStats.Uid
...
(cherry picked from commit 2350b8445c
2015-09-18 17:12:30 -07:00
Jason Monk
0217281d33
Add color transform setting
...
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
2015-09-18 20:11:01 -04:00
Jim Miller
d433359684
Add summary for 0 fingerprint settings preference
...
This allows the fingerprint summary to be shown when there
are no fingerprints.
Fixes bug 24172006
Change-Id: I9dd266013ac74da74f1dd397cbe0e50acf5d1262
2015-09-18 15:37:48 -07:00
Adam Lesinski
0896a2e545
am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '65477c800fabbce6586bc2782ce56167e0bd2734':
Update implementation to match BatteryStats.Uid
2015-09-18 20:42:31 +00:00
Adam Lesinski
65477c800f
am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '031bbef57e7d8e18b238bac4e3e7c356b0055655':
Update implementation to match BatteryStats.Uid
2015-09-18 20:32:04 +00:00
Adam Lesinski
031bbef57e
Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
2015-09-18 20:26:06 +00:00
Baligh Uddin
8223038551
Import translations. DO NOT MERGE
...
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
2015-09-18 10:37:08 -07:00
Paul Lawrence
e68e93fc36
am 67d0fe4c: am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '67d0fe4c0ec169514c05ec485834fca353ebc9d2':
Stop long passwords crashing CryptKeeper
2015-09-18 15:57:21 +00:00
Paul Lawrence
67d0fe4c0e
am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'fe9b6d3e2e08e689a6b770df497e717a1a5e767e':
Stop long passwords crashing CryptKeeper
2015-09-18 15:49:04 +00:00
Paul Lawrence
fe9b6d3e2e
am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
Stop long passwords crashing CryptKeeper
2015-09-18 15:38:15 +00:00
Paul Lawrence
aead1b2581
am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
Stop long passwords crashing CryptKeeper
2015-09-18 15:32:29 +00:00
Paul Lawrence
43be4b9b78
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
2015-09-18 15:26:01 +00:00
Paul Lawrence
9db2961ad0
am 1ec8f89b: am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit '1ec8f89b8e6efcb2453135a12a1a0a08ccdcb583':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:58:04 +00:00
Paul Lawrence
1ec8f89b8e
am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit '98e9c7472ccb8f45220f73bf1c693f681681c00a':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:49:49 +00:00
Paul Lawrence
98e9c7472c
am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit '8d28491a2f2d8ef8e2142171d290f46f381c8a76':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:44:08 +00:00
Paul Lawrence
8d28491a2f
am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit 'c2e73bbc06739cdd55f7baaca8ab1aa915ee6e83':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:37:01 +00:00
Paul Lawrence
c2e73bbc06
Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
2015-09-18 14:31:11 +00:00
Paul Lawrence
44985b9ccd
Stop long passwords crashing CryptKeeper
...
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
2015-09-16 15:29:57 -07:00
Baligh Uddin
647ab07f95
am cdf9e483: (-s ours) am e4c1dccd: (-s ours) am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'cdf9e48335deed100505622a0e721a720b03838b':
Import translations. DO NOT MERGE
2015-09-15 14:37:45 +00:00
Baligh Uddin
cdf9e48335
am e4c1dccd: (-s ours) am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'e4c1dccda9719c1432b28eea90fbb0381d99638c':
Import translations. DO NOT MERGE
2015-09-15 14:32:12 +00:00
Baligh Uddin
e4c1dccda9
am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '6df1ad97c906e936255a9feee6631b1684b0fa09':
Import translations. DO NOT MERGE
2015-09-15 14:27:34 +00:00
Baligh Uddin
6df1ad97c9
am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'ba98cc2c1463b33c383e8399eb7742aa50b5a027':
Import translations. DO NOT MERGE
2015-09-15 14:20:20 +00:00
Baligh Uddin
66402753e4
Merge "Import translations. DO NOT MERGE"
2015-09-15 14:12:45 +00:00
Baligh Uddin
ba98cc2c14
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-15 14:12:42 +00:00
Hyejin
7837e0272b
am 375633ae: am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '375633aea2a5ba9b0fc3b099bead8bbfef6a4cf3':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:49:17 +00:00
Hyejin
375633aea2
am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '1dcb1135b8157977cd44c05768f422243d64df83':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:45:21 +00:00
