github.com/PitchBlackRecoveryProject/android_system_security commits

Merge "Fix google-explicit-constructor warnings." am: e218406 am: e44c337

am: 9976622

* commit '997662290cae89be86c7b3a7264e27d896c1d96c':
Fix google-explicit-construct...

639746c103e0f1261d4c461d14c1457ab75fe401 authored almost 9 years ago

Merge "Fix google-explicit-constructor warnings." am: e218406

am: e44c337

* commit 'e44c337371a5efbb28a4e90dd8302cde21453580':
Fix google-explicit-construct...

997662290cae89be86c7b3a7264e27d896c1d96c authored almost 9 years ago

Merge "Fix google-explicit-constructor warnings."

am: e218406

* commit 'e21840600ce3c33696f8eecd07e0ae6e84699f56':
Fix google-explicit-construct...

e44c337371a5efbb28a4e90dd8302cde21453580 authored almost 9 years ago

Merge "Fix google-explicit-constructor warnings."

e21840600ce3c33696f8eecd07e0ae6e84699f56 authored almost 9 years ago

Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I116d2667550eec7a080bd5fcf073a8e7206c7c53

d3bccc881bf3421e9e71173a687db4ae1a06af4a authored almost 9 years ago

Move keystore to foreground cpuset. am: 1140ef6 am: 37ca417

am: 6f4a37a

* commit '6f4a37ad32ab3c5701689ce70bf1e1c7b4983804':

Change-Id: I01c9365aa37d1951b7...

31d34215a0f08fb774efa29e664e85ee7a10d37f authored almost 9 years ago

Move keystore to foreground cpuset. am: 1140ef6 am: 3b7ab77

am: ec4eb75

* commit 'ec4eb7578a58781b0a9fdf4b08319f228314283c':
Move keystore to foreground c...

5742ab040fd3a14cf1dd01d3c48dcc7cf349d948 authored almost 9 years ago

Move keystore to foreground cpuset. am: 1140ef6

am: 37ca417

* commit '37ca4172bb9c62ff25b5277ad7066935f538b749':

Change-Id: I4f148c051fb195e08f...

6f4a37ad32ab3c5701689ce70bf1e1c7b4983804 authored almost 9 years ago

Move keystore to foreground cpuset. am: 1140ef6

am: 3b7ab77

* commit '3b7ab772768704f8c1b05de7103188810565c260':
Move keystore to foreground c...

ec4eb7578a58781b0a9fdf4b08319f228314283c authored almost 9 years ago

Move keystore to foreground cpuset.

am: 1140ef6

* commit '1140ef674e2098bb3ac4360baafb1562760b441c':
Move keystore to foreground c...

3b7ab772768704f8c1b05de7103188810565c260 authored almost 9 years ago

Move keystore to foreground cpuset.

am: 1140ef6

* commit '1140ef674e2098bb3ac4360baafb1562760b441c':
Move keystore to foreground c...

37ca4172bb9c62ff25b5277ad7066935f538b749 authored almost 9 years ago

Move keystore to foreground cpuset.

Bug: 24949295
Change-Id: Iaade68c5216d0efabdfdec4ff2b61d778d319324

1140ef674e2098bb3ac4360baafb1562760b441c authored almost 9 years ago

Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." am: 193059d am: c5e91c2

am: e96063f

* commit 'e96063f05243774b10edcc1b29613b583c29b965':
Remove RSA_FLAG_EXT_PKEY from...

fd2bbfcc837cc568733a72805c291d8f69ed9040 authored almost 9 years ago

Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." am: 193059d

am: c5e91c2

* commit 'c5e91c2e8409400395bb7187a7fb98c34722a34c':
Remove RSA_FLAG_EXT_PKEY from...

e96063f05243774b10edcc1b29613b583c29b965 authored almost 9 years ago

Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp."

am: 193059d

* commit '193059de3b68259ff0afdee96da14d6b8507dab6':
Remove RSA_FLAG_EXT_PKEY from...

c5e91c2e8409400395bb7187a7fb98c34722a34c authored almost 9 years ago

Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp."

193059de3b68259ff0afdee96da14d6b8507dab6 authored almost 9 years ago

resolve merge conflicts of faac064 to nyc-dev-plus-aosp

am: ff2e505

* commit 'ff2e5051ae2cda043f9de2deb0bde5bd2ab28da6':
Export libbinder headers from...

df19c901f9003d2ffb173aec0e71d74773579ef2 authored almost 9 years ago

resolve merge conflicts of faac064 to nyc-dev-plus-aosp

Change-Id: I8c3344ad03202f8ce2a8985b135dfcd53d9a6524

ff2e5051ae2cda043f9de2deb0bde5bd2ab28da6 authored almost 9 years ago

Merge "Export libbinder headers from libkeystore_binder"

am: 52e5773

* commit '52e5773eb9c40cc7507df31422ee79cdf58e01ed':
Export libbinder headers from...

faac06437ae01ebfdc5a0402b0b6fc5b0b42d869 authored almost 9 years ago

Merge "Export libbinder headers from libkeystore_binder"

52e5773eb9c40cc7507df31422ee79cdf58e01ed authored almost 9 years ago

Export libbinder headers from libkeystore_binder

libkeystore_binder's headers include libbinder headers and consumers
of those headers will requi...

955cd847a1269176c174f5181d1c18ad03b8027c authored almost 9 years ago

Configure keymaster with OS version info. am: 814a6e7

am: 15a89da

* commit '15a89da10b8a3b680791ed77faeec8922eaf4177':
Configure keymaster with OS v...

1a8a9a4b259869be01424d4d90fafe3f2d0ad121 authored almost 9 years ago

Implement key upgrade in keystore. am: 98c5916

am: 1239911

* commit '1239911e8116ae81b3bcb7efbd007b3e4277ea31':
Implement key upgrade in keys...

ee3de990d9e193eaa5aa4c54d45dec8e93867ef1 authored almost 9 years ago

Implement key upgrade in keystore.

am: 98c5916

* commit '98c5916d4a807614fad5fdfb63aa10d724b9ef0a':
Implement key upgrade in keys...

1239911e8116ae81b3bcb7efbd007b3e4277ea31 authored almost 9 years ago

Configure keymaster with OS version info.

am: 814a6e7

* commit '814a6e725cd89ad6bf27a9951d25025dc9ace9a8':
Configure keymaster with OS v...

15a89da10b8a3b680791ed77faeec8922eaf4177 authored almost 9 years ago

Implement key upgrade in keystore.

Change-Id: I0cf169d9366aee1de32f1cc4501af76e6e1bc505

98c5916d4a807614fad5fdfb63aa10d724b9ef0a authored almost 9 years ago

Configure keymaster with OS version info.

Change-Id: Ia09591dbea04ff5d45370b47341efa5bf34604ce

814a6e725cd89ad6bf27a9951d25025dc9ace9a8 authored almost 9 years ago

Remove RSA_FLAG_EXT_PKEY from android_engine.cpp.

RSA_FLAG_EXT_PKEY, despite the name, is only about calling the RSA_METHOD's
mod_exp hook while r...

30c77521cad995f7d3e7402b0d8efa0ace873c77 authored almost 9 years ago

Fix AuthTokenTable tests.

am: 47d2616

* commit '47d2616439c134502d9ee87a3d4bda065e3d5324':
Fix AuthTokenTable tests.

5a15c7e5d503d232b88357ba6d34b31092d33032 authored almost 9 years ago

Fix AuthTokenTable tests.

The local unit test bit-rotted. This fixes it.

Change-Id: I37c8dbd894b69f3a48aefdd4f71339c45d5...

47d2616439c134502d9ee87a3d4bda065e3d5324 authored almost 9 years ago

Merge "keystore_cli_v2: Update AES parameters"

am: 0348d00

* commit '0348d006cb197daef5d99138b4eaff8949b6ee38':
keystore_cli_v2: Update AES p...

c7f07377e459659e504014f18c72511202a7f78c authored almost 9 years ago

Merge "keystore_cli_v2: Update AES parameters"

0348d006cb197daef5d99138b4eaff8949b6ee38 authored almost 9 years ago

keystore_cli_v2: Update AES parameters

Set padding mode to PAD_NONE for AES when using
non GCM block ciphers.

BUG=27555165

Change-Id:...

250b40b41973fc824316f3c5e3e9053e94281b0f authored almost 9 years ago

Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE." am: 6148b2043b

am: 29e2f1c659

* commit '29e2f1c659f46b1924d304ebce32a32eb4aa1b1b':
keystore_cli_v2: Removed t...

799aec542adee3ca525f98e39b02bd8fdb0d59c0 authored almost 9 years ago

Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE."

am: 6148b2043b

* commit '6148b2043bb4dd2ddb8c98289fe6b9a482395e31':
keystore_cli_v2: Removed t...

29e2f1c659f46b1924d304ebce32a32eb4aa1b1b authored almost 9 years ago

Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE."

6148b2043bb4dd2ddb8c98289fe6b9a482395e31 authored almost 9 years ago

keystore_cli_v2: Removed test for KM_TAG_PURPOSE.

Enforcement of this tag may be nuanced. E.g. HW may not allow decryption
with a signing key, but...

01fc9a4887d4a6e1fa203ebd040df057313db8b7 authored almost 9 years ago

Merge "keystore_cli_v2: Add support for testing against v0.3." am: 187b8f7a07

am: 45ca6e53af

* commit '45ca6e53afe2e8a59f43968b8a7d9cda102a81d8':
keystore_cli_v2: Add suppo...

0f93e7875ed8ce2c09ca9d11293858349a7b7b0c authored almost 9 years ago

Merge "keystore_cli_v2: Add support for testing against v0.3."

am: 187b8f7a07

* commit '187b8f7a07abbcaa4f870499e2c0af8ac64b6cfb':
keystore_cli_v2: Add suppo...

45ca6e53afe2e8a59f43968b8a7d9cda102a81d8 authored almost 9 years ago

Merge "keystore_cli_v2: Add support for testing against v0.3."

187b8f7a07abbcaa4f870499e2c0af8ac64b6cfb authored almost 9 years ago

Merge "Fix various memory errors." am: 29c54e37b2

am: 7388228191

* commit '7388228191dc1eda446ea6e79a6fcec3507eca00':
Fix various memory errors.

fe37d0cea2450737f302bd56d027c7a7b1ba7b1d authored almost 9 years ago

Merge "Fix various memory errors."

am: 29c54e37b2

* commit '29c54e37b225989a3adebf0feca1d574989a6c8b':
Fix various memory errors.

7388228191dc1eda446ea6e79a6fcec3507eca00 authored almost 9 years ago

keystore_cli_v2: Add support for testing against v0.3.

Also drop some of the tags that were being checked but aren't strictly
required to be hardware-b...

82f4f5b90e9bc2b94c5cb886872e26c001a96421 authored almost 9 years ago

Merge "Fix various memory errors."

29c54e37b225989a3adebf0feca1d574989a6c8b authored almost 9 years ago

Fix various memory errors.

Bug: 26910835
Change-Id: I2973221a798b08bbde6dc7ac5464a99b2dc26b4d

eb1adaf56d7256c3948c75b8502066604dd97f68 authored almost 9 years ago

Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_PrivateKey|." am: ec43173804

am: 5e9794f284

* commit '5e9794f284a226bcc053c66d58e2699cc1781c02':
system/security/softkeymas...

9d69b1bd1f9217675c2d922774dea9b167bd5251 authored almost 9 years ago

Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_PrivateKey|."

am: ec43173804

* commit 'ec43173804b076e1f76d1a7173a55688003390d6':
system/security/softkeymas...

5e9794f284a226bcc053c66d58e2699cc1781c02 authored almost 9 years ago

Merge "system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|."

ec43173804b076e1f76d1a7173a55688003390d6 authored almost 9 years ago

system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|.

Some OpenSSL parsing functions have, historically, allowed a structure
to be passed in to reuse ...

44ee6263b8eef8b65cb985ed88e1b413b0f25a12 authored almost 9 years ago

Merge commit \'b0adba8170cb5df45629876998229bc0f3c6dd6b\' into HEAD

am: 5c2c1f9448

* commit '5c2c1f9448ed3b8d749bf332eb0d47be54cfa10e':

c3c8a8ba8d3e1d686f3c75d31cea390e94bc3fbb authored almost 9 years ago

Merge commit 'b0adba8170cb5df45629876998229bc0f3c6dd6b' into HEAD

5c2c1f9448ed3b8d749bf332eb0d47be54cfa10e authored almost 9 years ago

Actually pass attestation requests through to keystore.

Bug: 22914603
Change-Id: I49f2386943c90cd29a80556fd48087793dd5ca66

3976b6c43e2809662940d52306e03b2733112d05 authored almost 9 years ago

Fix various memory errors.

Bug: 26910835
Change-Id: I2973221a798b08bbde6dc7ac5464a99b2dc26b4d

067042f6d7be14cb0f01388c41af597caf8e60fe authored almost 9 years ago

Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8

am: e30ca16ae0

* commit 'e30ca16ae0e41375201de9132866f5680a5d7baa':
Add KM_TAG_ALLOW_WHILE_ON_...

b3bb39218888c573c1b341d3ee11516b9ad2d3b4 authored almost 9 years ago

Merge changes from topic \'km_tag_allow_on_body\'

am: a1433ee2f8

* commit 'a1433ee2f85ae9d2db4e9eb996b6b23af1542247':
Add KM_TAG_ALLOW_WHILE_ON_...

e30ca16ae0e41375201de9132866f5680a5d7baa authored almost 9 years ago

Merge changes from topic 'km_tag_allow_on_body'

* changes:
Add KM_TAG_ALLOW_WHILE_ON_BODY
Add attestation support to keystore.

a1433ee2f85ae9d2db4e9eb996b6b23af1542247 authored almost 9 years ago

Add KM_TAG_ALLOW_WHILE_ON_BODY

Actually, this change eliminates the need to update keystore_cli_v2
every time a tag is added, w...

d3fac68c4982a5a188c0b3648eea2f16c4791d21 authored almost 9 years ago

Add attestation support to keystore.

Bug: 22914603
Change-Id: I14fbfbe30b96c5c29278fa548e06b65f15942fe2

50eb1b2f89ca455b2e9caa635bfe0b5ed94b416a authored almost 9 years ago

Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5

am: f647e0a994

* commit 'f647e0a99492d21825e891c53b9a05fed04dbb9c':
Update Keystore to use key...

89c52f16ecea4ebf08d6b3c863e0848438bac23d authored about 9 years ago

Merge "Update Keystore to use keymaster2 HAL."

am: fd50293cd5

* commit 'fd50293cd5f91936ea954b0556f3f434243adf27':
Update Keystore to use key...

f647e0a99492d21825e891c53b9a05fed04dbb9c authored about 9 years ago

Merge "Update Keystore to use keymaster2 HAL."

fd50293cd5f91936ea954b0556f3f434243adf27 authored about 9 years ago

Refactor keystore.

This CL isn't nearly as big as it looks. It doesn't change keystore
functionality, it just move...

c1d1feee514e6138e1ed8ff924f5453ba8e1408a authored about 9 years ago

Merge "Refactor keystore." am: e4f2fa54b0

am: 63e1e79476 -s ours

* commit '63e1e794768d2960f95b569ad587847d7e14b8ba':
Refactor keystore.

8f3f1120e6061a49e818a55bb5eaf90f6bab34a0 authored about 9 years ago

Merge "Refactor keystore."

am: e4f2fa54b0

* commit 'e4f2fa54b009838f72219735d692d84d062a0177':
Refactor keystore.

63e1e794768d2960f95b569ad587847d7e14b8ba authored about 9 years ago

Merge "Refactor keystore."

e4f2fa54b009838f72219735d692d84d062a0177 authored about 9 years ago

Refactor keystore.

This CL isn't nearly as big as it looks. It doesn't change keystore
functionality, it just move...

6507c27ab7ea34dd150d7ef9fda41878ed32547c authored about 9 years ago

Update Keystore to use keymaster2 HAL.

This CL doesn't wire in any of the new keymaster2 features, it just uses
the keymaster2 HAL rath...

715d023c9294cf4860f73c8d83e82c5aa699add6 authored about 9 years ago

keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s ours

am: de4e6af56d

* commit 'de4e6af56d25d0cfbbed736f6f125e5c6aac4d58':

935f1b60086ae38e607dcb6905d4980f586ba040 authored about 9 years ago

keep history after reset to mnc-dr-dev

am: d1b3dc5f63 -s ours

* commit 'd1b3dc5f636067f47fd1ec97d5ba89fd0ac9f710':

de4e6af56d25d0cfbbed736f6f125e5c6aac4d58 authored about 9 years ago

keep history after reset to mnc-dr-dev

d1b3dc5f636067f47fd1ec97d5ba89fd0ac9f710 authored about 9 years ago

Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2

am: 9eedb2e603

* commit '9eedb2e60307856dafc53ed4331708ce70c89df3':
Update keystore_cli_v2 for...

c3034a6d9cdb4c231e205d343f667444bbe519cd authored about 9 years ago

Merge "Update keystore_cli_v2 for keymaster_defs changes."

am: 93c57ca1b2

* commit '93c57ca1b243c2cb4a6e516b1f99e7aed407e53a':
Update keystore_cli_v2 for...

9eedb2e60307856dafc53ed4331708ce70c89df3 authored about 9 years ago

Merge "Update keystore_cli_v2 for keymaster_defs changes."

93c57ca1b243c2cb4a6e516b1f99e7aed407e53a authored about 9 years ago

Update keystore_cli_v2 for keymaster_defs changes.

Change-Id: I6a584c8f0ae7a0461ea33836f0ca15bc89f2367f

9d9318efdf9e4a6236af3f57abfedadc2f9292dd authored about 9 years ago

Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 am: 80b09638de

am: 6e645e0e7e

* commit '6e645e0e7ee687ababf5700e36b271700580de88':

fc7725947870227df7e4459a05d33f2eb159b2f5 authored about 9 years ago

Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6

am: 5a02a61066

* commit '5a02a610665a5ef7a14655651aac1da80da7e5dd':

9c9cdbfd85823d42ceef0704a46812eb0ab171fc authored about 9 years ago

Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 am: 80b09638de

am: b0adba8170

* commit 'b0adba8170cb5df45629876998229bc0f3c6dd6b':
Limit maximum number of co...

788ca11517d5b1c0d6485da1ccc19a8a8798edbb authored about 9 years ago

Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5

am: 80b09638de

* commit '80b09638de3571d2c12aa3d6e3d22682fc431b72':
Limit maximum number of co...

b0adba8170cb5df45629876998229bc0f3c6dd6b authored about 9 years ago

Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5

am: 80b09638de

* commit '80b09638de3571d2c12aa3d6e3d22682fc431b72':
Limit maximum number of co...

6e645e0e7ee687ababf5700e36b271700580de88 authored about 9 years ago

Merge "Limit maximum number of concurrent keystore operations."

am: 108a5d34b5

* commit '108a5d34b5ce181dff52906a66862ec084841ec4':
Limit maximum number of co...

80b09638de3571d2c12aa3d6e3d22682fc431b72 authored about 9 years ago

Merge "Limit maximum number of concurrent keystore operations."

108a5d34b5ce181dff52906a66862ec084841ec4 authored about 9 years ago

Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6

am: 347c9b233e

* commit '347c9b233e0f0f03ad3b48d5b512a990934914dc':
ECIES: adding ECIES-KEM

82f353182571d9e1f1036ccde0000178dd143735 authored about 9 years ago

Merge "ECIES: adding ECIES-KEM" am: ab42146068

am: e5f3a444f6

* commit 'e5f3a444f692f2d61d54783021551bb82c56e507':
ECIES: adding ECIES-KEM

5a02a610665a5ef7a14655651aac1da80da7e5dd authored about 9 years ago

Merge "ECIES: adding ECIES-KEM" am: ab42146068

am: e5f3a444f6

* commit 'e5f3a444f692f2d61d54783021551bb82c56e507':
ECIES: adding ECIES-KEM

347c9b233e0f0f03ad3b48d5b512a990934914dc authored about 9 years ago

Merge "ECIES: adding ECIES-KEM"

am: ab42146068

* commit 'ab421460681045f2037552611ece53ea08f9ebc5':
ECIES: adding ECIES-KEM

e5f3a444f692f2d61d54783021551bb82c56e507 authored about 9 years ago

Merge "ECIES: adding ECIES-KEM"

ab421460681045f2037552611ece53ea08f9ebc5 authored about 9 years ago

Limit maximum number of concurrent keystore operations.

Bug: 25312003
Change-Id: I3bcae59c6a79d5f7d2e2f432251bb7b818f57581

447095f2a797e7ffeeda13477498d4dda0a7353a authored about 9 years ago

ECIES: adding ECIES-KEM

Change-Id: I9f4dd30786f5de170c2e12c1cff52b9ecbb26a2c

0ba9f6e4eb086ad71f8dcd8684c021f95838be0b authored about 9 years ago

Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 am: 6c4a59b0f8

am: bd6db0b4ab

* commit 'bd6db0b4ab6b1175e5542cd0d93811ce56931cb5':
keystore: Add a test suita...

9fa8f625012a88ff5b56f1e42f1e3fe79562fb7d authored about 9 years ago

Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895

am: 6c4a59b0f8

* commit '6c4a59b0f8c09db267d71313413ceaa7713924bb':
keystore: Add a test suita...

bd6db0b4ab6b1175e5542cd0d93811ce56931cb5 authored about 9 years ago

Merge "keystore: Add a test suitable for Brillo PTS."

am: 296727f895

* commit '296727f895b37f5647618bd1b486de6faa5ed423':
keystore: Add a test suita...

6c4a59b0f8c09db267d71313413ceaa7713924bb authored about 9 years ago

Merge "keystore: Add a test suitable for Brillo PTS."

296727f895b37f5647618bd1b486de6faa5ed423 authored about 9 years ago

keystore: Add a test suitable for Brillo PTS.

The test can be run with the command:
keystore_cli_v2 brillo-platform-test

Test results will ...

a9474ab90fcda96d6d798ace3fd9027ae61141e1 authored about 9 years ago

Merge "Add keystore to AID_READPROC" am: 641c6299e5 am: 0768b9943c

am: b98232f489

* commit 'b98232f48983e3c874df3eae15a612005ee1f509':
Add keystore to AID_READPROC

d0aff1dae80f8997524a24f11d08c88e62e6ecb0 authored about 9 years ago

Merge "Add keystore to AID_READPROC" am: 641c6299e5

am: 0768b9943c

* commit '0768b9943cc0b4f8377eafb9486f4f17177378ed':
Add keystore to AID_READPROC

b98232f48983e3c874df3eae15a612005ee1f509 authored about 9 years ago

Merge "Add keystore to AID_READPROC"

am: 641c6299e5

* commit '641c6299e51d517bd27149069be39f7770c76234':
Add keystore to AID_READPROC

0768b9943cc0b4f8377eafb9486f4f17177378ed authored about 9 years ago

Merge "Add keystore to AID_READPROC"

641c6299e51d517bd27149069be39f7770c76234 authored about 9 years ago

Add keystore to AID_READPROC

keystore access /proc entries associated with other UIDs.
Allow it.

Bug: 23310674
Change-Id: I7...

d92d2cd035123164055ef4f14bbcf1902cda8808 authored about 9 years ago

Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD am: 46fbb2b5df

am: d9944fa828

* commit 'd9944fa8282a8614ad65d65196d06f0380901484':

2d59278e60bfa344683fa88231cb152a0898ae46 authored about 9 years ago

Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD

am: 46fbb2b5df

* commit '46fbb2b5df1aa40fb248eea281f267339f99ed1e':

d9944fa8282a8614ad65d65196d06f0380901484 authored about 9 years ago

Ecosyste.ms: OpenCollective

github.com/PitchBlackRecoveryProject/android_system_security