Xiaohui Chen
aa38035ef5
Merge "Cleanup OWNER in Settings"
2015-09-22 18:14:16 +00:00
Zach Jang
562251a0bd
am 0347c7e6: (-s ours) am 00108830: am 0acd070f: am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0347c7e6384a3561b1b75e1f709b0be6e93be750':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:09:14 +00:00
Zach Jang
21e0cf9558
am 30602632: (-s ours) am 4925e623: am 0ac53af0: am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '306026329fa055532d1cdf2840af98fb1705de9b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:09:12 +00:00
Zach Jang
0347c7e638
am 00108830: am 0acd070f: am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '00108830be3293244b3f5e53bb2a681980ba58e5':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:02:11 +00:00
Zach Jang
306026329f
am 4925e623: am 0ac53af0: am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '4925e6234f522ee7d3c2b20ed9617df0759c0ae0':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 22:02:09 +00:00
Zach Jang
00108830be
am 0acd070f: am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0acd070f559ba464378c2871733b0ba3a07514f2':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:52:33 +00:00
Zach Jang
4925e6234f
am 0ac53af0: am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0ac53af01a8c644925f9d30596de7a36ec5ef5b8':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:52:32 +00:00
Zach Jang
0acd070f55
am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '61b8955c86a9c949888949be91c06fadf04890cb':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:44:49 +00:00
Zach Jang
0ac53af01a
am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '825518b7b996d5d8df84f801b3d1725e786f132f':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:44:48 +00:00
Zach Jang
61b8955c86
am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '8fef0576518fa9baaf701e1da5564c2f6f2d9645':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:37:15 +00:00
Zach Jang
825518b7b9
am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '2ead093496c3b5b266c21a483c4f0c37869d57de':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:37:14 +00:00
Zach Jang
8fef057651
am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '7b2994d2e87eafe84425666aba8f818e661a6fac':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:30:07 +00:00
Zach Jang
2ead093496
am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '386c7763eb8cd3e856a26fe3cbd39cc573978c29':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:30:06 +00:00
Zach Jang
7b2994d2e8
am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '1304f47c1b63d1daa001f4d1c209a34f1b3af5d3':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:06:16 +00:00
Zach Jang
386c7763eb
am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '564ec9357bac62d571ba8ba9d58957477b8b5209':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:06:13 +00:00
Zach Jang
1304f47c1b
am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '5cac896612ead73d08acb588e2f62512f8789cf4':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:39 +00:00
Zach Jang
564ec9357b
am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:36 +00:00
Zach Jang
5cac896612
am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '8fc9b5b68494ac341b882623b1cbe124fd6256f8':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:23 +00:00
Zach Jang
00721b4afa
am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:12 +00:00
Xiaohui Chen
9965b1438b
Cleanup OWNER in Settings
...
Bug: 19913735
Change-Id: Iada650431328a304f7c1e6acb8cbde76e4210127
2015-09-21 10:14:49 -07:00
Julia Reynolds
cf92ef10a5
Updates to automatic rule listing page for 3P rules.
...
Show the provider app icon and name; allow deletion from
listing page; remove the rule summary for consistency.
Bug: 22977552
Change-Id: Ib71832fa4ff64b7321ade39f9964ac52cee6c643
2015-09-21 11:30:02 -04:00
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
