github.com/PitchBlackRecoveryProject/android_external_bouncycastle commits

Add @hide to generated bouncycastle public classes

Add @hide to generated bouncycastle public classes to avoid
them showing up in the public SDK AP...

e48f4a82c11c85e966daadcb9beaf670759d7055 authored over 6 years ago

Merge "Reduce dependencies of device bouncycastle targets" am: 48385930b1 am: 3f2f5b247b

am: 5527144f3c

Change-Id: I0459f063b69ce8d56b89adfe5178c4c03aae93dd

0282a02a7d7c654641bd04d20dcb02ae68ee1585 authored over 6 years ago

Merge "Reduce dependencies of device bouncycastle targets" am: 48385930b1

am: 3f2f5b247b

Change-Id: I6f375608fe20d44d2bd238157b59d9f234755c43

5527144f3c08749c6b1e6f6a591075f34b348e0c authored over 6 years ago

Merge "Reduce dependencies of device bouncycastle targets"

am: 48385930b1

Change-Id: I09ac626a478cd4a765574d53d8d3330e2734eb71

3f2f5b247b208f3cd804bd1f271556ed172e6973 authored over 6 years ago

Merge "Reduce dependencies of device bouncycastle targets"

48385930b1155efe8146694d8587ed45f3f7adba authored over 6 years ago

Reduce dependencies of device bouncycastle targets

This commit changes the device bouncycastle targets to depend
on core.current.stubs (the parts o...

38f359e2c30c0acf89a53988ba05ebea981cd4ce authored over 6 years ago

Merge "Use generated source not jarjar" am: 1c8037fcd4 am: b4771c61d2

am: f9363b1747

Change-Id: I49e9201cdfb2dd1f628bf28960c9cd4044db7095

3839861bb3b993ceed1c0682dd5e51ff8c653c05 authored over 6 years ago

Merge "Use generated source not jarjar" am: 1c8037fcd4

am: b4771c61d2

Change-Id: I9445f23960ce3c584f00e303c7325c77d895744a

f9363b174777d68ef004ce1d7b1bd5c8751bbceb authored over 6 years ago

Merge "Use generated source not jarjar"

am: 1c8037fcd4

Change-Id: Ide079746455f85b65b50ae2727628cf108d51789

b4771c61d23ef9ce544d2497599439e179581b96 authored over 6 years ago

Merge "Use generated source not jarjar"

1c8037fcd4e0af1964f17729a484c34de3f31f5d authored over 6 years ago

Use generated source not jarjar

This commit switches to generating source code for
com.android.org.bouncycastle used on Android ...

6a4a86b302cfc63e6917aef1f6937dae90646571 authored over 6 years ago

Merge "Merge Android Pie into master" am: 8ac7044ca4 am: e0093e6ddb am: bea9f6003d

am: 100c74d614

Change-Id: If48a458b12f59c56fc06bfe5c15b28178536a779

03a62717a56e70f32d5548d284dce38d67120bde authored over 6 years ago

Merge "Merge Android Pie into master" am: 8ac7044ca4 am: e0093e6ddb

am: bea9f6003d

Change-Id: I7ea240c3a7146ce0e7262233186dc706f8ded465

100c74d61488a31255f23371dcf60ff794025763 authored over 6 years ago

Merge "Merge Android Pie into master" am: 8ac7044ca4

am: e0093e6ddb

Change-Id: I324b7629ae75390fae5d7463376bb52a6127f3b5

bea9f6003de5fe0632274208167eb8c2f442717f authored over 6 years ago

Merge "Merge Android Pie into master"

am: 8ac7044ca4

Change-Id: Ic9483b4b21a9b1b704eff4ca41fe0d975383ba4a

e0093e6ddbc0525c530957f356e28f8b0e5e7b89 authored over 6 years ago

Merge "Merge Android Pie into master"

8ac7044ca44505764fdc9fa4e96fe79c11a2736a authored over 6 years ago

Merge Android Pie into master

Bug: 112104996
Change-Id: I22e81fef7f8fab8fb5b232a3d9730db435ccf61a

e2e71a038670b4fa3698429f7d0f98d2a83b8054 authored over 6 years ago

Merge "Make the bouncycastle build targets more regular" am: 92e371bf81 am: f97eb5d3c7 am: c09a315b25

am: 1d13e6d888

Change-Id: I5021fa5497e24a2e4ce049ca8815f869934949c9

9ebac8c0de4a7d6cb6498a4dd9198ef8827065b1 authored over 6 years ago

Merge "Make the bouncycastle build targets more regular" am: 92e371bf81 am: f97eb5d3c7

am: c09a315b25

Change-Id: Ia9664d6dc07118e090f1f4ea735c40da0834e53e

1d13e6d888767e89010af5dc992d7b335d5b2849 authored over 6 years ago

Merge "Make the bouncycastle build targets more regular" am: 92e371bf81

am: f97eb5d3c7

Change-Id: Ie2c39e81df351ddd9c3ff9ad017b6b6997b60773

c09a315b256784baaee798a959fd8a21e569613a authored over 6 years ago

Merge "Make the bouncycastle build targets more regular"

am: 92e371bf81

Change-Id: I2ee09963deb7554e7fa56e3e5f0ec7593ec93103

f97eb5d3c79fc1187f68fd02b404ee0ef6333c5b authored over 6 years ago

Merge "Make the bouncycastle build targets more regular"

92e371bf810507957295981437c1fda6c3208fef authored over 6 years ago

Make the bouncycastle build targets more regular

Before this commit:

The "bouncycastle", "bouncycastle-ocsp" and "bouncycastle-bcpkix"
targets d...

ef76c7372ad200756aea21c070bc20bafb420b17 authored over 6 years ago

Merge "Mark installable jars with installable: true" am: 8e9d1c24cc am: aef6b98f57

am: 34a593bc10

Change-Id: Iac7e67bc5eaaf1af60822ba38d796a596e3c53a3

ff83fa7363cf974d1b4f24a0be50386fd8b28458 authored over 6 years ago

Merge "Mark installable jars with installable: true" am: 8e9d1c24cc

am: aef6b98f57

Change-Id: I50c0c3d03b798330b491e8fd91eae807824546c2

34a593bc108b38e0ec1f41fb8ce51a7a07de314e authored over 6 years ago

Merge "Mark installable jars with installable: true"

am: 8e9d1c24cc

Change-Id: I1a65ba1a829f18471545d97ec3ab76c409516d71

aef6b98f574d100ec9db4d1c54643ee23053ee57 authored over 6 years ago

Merge "Mark installable jars with installable: true"

8e9d1c24cc78d60ba5c4c02c224c09746bada860 authored over 6 years ago

Mark installable jars with installable: true

Most jars don't need to be installed on the device. Instead of
using java_library and java_libr...

ba42b6972d043ad9564a7036ea3c463bb555e32c authored over 6 years ago

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: a7f84acd9a

am: 52da82e373

Change-Id: I8e18c8e1b1fa97b0c91b8d6e4b60a4ffda9f6c02

1324a4066b314b14fe2eda0f4b7e0c0f2fae81cf authored over 6 years ago

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

am: a7f84acd9a

Change-Id: Ifd2cb691721351fc0e229bd677b7424d53826d68

52da82e373ce0da3d0d293b4c0ae9bfce89b8020 authored over 6 years ago

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: I1a098dfe399351ee0424dbc03d0b4a6b4ecbd13c

a7f84acd9a94591353e99a24f9ea238403075523 authored over 6 years ago

Snap for 4778776 from 1dd6ff9211e597935e334d610b6831473f11db5d to pi-release

Change-Id: Ie1437a955ee4b28bf464a2a23db2350e03e7452d

d9357c697189fec02fc6c5ec31f0edb1ab2a88d1 authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd am: 630facd786 am: 77321115ab am: 87804b8da9 am: 883aa9d8f8 am: 8221e0766e am: 1dd6ff9211

am: 0908ee0eee

Change-Id: I0570a7f345ae871a684c4d1c66a861ebd496bd14

9f93807f14b86e2f63854a17d3b7c993c2da062a authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd am: 630facd786 am: 77321115ab am: 87804b8da9 am: 883aa9d8f8 am: 8221e0766e

am: 1dd6ff9211

Change-Id: Icdcda163ef35afc1c9e2bdcc39f082b1b82b3522

0908ee0eee4086380718e32950ec09d95ec38235 authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd am: 630facd786 am: 77321115ab am: 87804b8da9 am: 883aa9d8f8

am: 8221e0766e

Change-Id: I65459162d9af9e07fa7a5de294d7bd54375c5d0b

1dd6ff9211e597935e334d610b6831473f11db5d authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd am: 630facd786 am: 77321115ab am: 87804b8da9

am: 883aa9d8f8

Change-Id: I845c8716a1f37a5d6a74ff4779d98704313a41bd

8221e0766e1d4be44e42f468f0f9a440c7ed2307 authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd am: 630facd786 am: 77321115ab

am: 87804b8da9

Change-Id: I71dcde16b772afb4d12aaca388b636193c6c58cf

883aa9d8f814820d59a3eb2b7c8948d22e77d416 authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd am: 630facd786 am: 77321115ab

Change-Id: I6c4990456568483d2718cfe7597aa3a56cbd1836

87804b8da9fa1c84d9627bb92a48da81a9186d4d authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd am: 630facd786

Change-Id: I21ee58faef2591f3b38a7dd9829490e35e8e6bc9

77321115aba6b0f7de87658a4cfbf222d972fc29 authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e am: b56197f5fd

Change-Id: I146fca8ce0d0e69c923be3c1d9dabdb53c041770

630facd7864d8f98b298b65e4ed16154af74c9f3 authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b am: b2a687151e

Change-Id: Ifb7c20efd9e4e92fec043c338ab840a6e70a4920

b56197f5fd909c8bc14ad54e9172764920612236 authored over 6 years ago

[automerger] Fix probable prime confidence calculations. am: 91719e3c1b

Change-Id: I2fb6d648930e15607772696a097550748075f568

b2a687151e567299c281dceee3a28ac7a531d20c authored over 6 years ago

Fix probable prime confidence calculations.

This fix from upstream fixes a problem where the number of iterations
used to confirm that a num...

91719e3c1be2eb206a50a49a5d172884d65eba1c authored over 6 years ago

Merge "Throw ShortBufferException in RSA CipherSpi." am: 23e859dfd2 am: 6a0a4c634f

am: 75d1f2809f

Change-Id: Ia282180118f0ec11043798c0b8df9f8754533527

6fccf9552d3a8b29768621c5f8d7f6c76fc42769 authored almost 7 years ago

Merge "Throw ShortBufferException in RSA CipherSpi." am: 23e859dfd2

am: 6a0a4c634f

Change-Id: I0b96a4291f70391df70d496af1cf2f5c7098061f

75d1f2809f6c1bcd3b11d251ff01172e2ab67b5f authored almost 7 years ago

Merge "Throw ShortBufferException in RSA CipherSpi."

am: 23e859dfd2

Change-Id: I5398e30ad57cf312e3d9729578efe7b7ddf2495f

6a0a4c634fad8d8a2125239ce4ade4a5d485c803 authored almost 7 years ago

Merge "Throw ShortBufferException in RSA CipherSpi."

23e859dfd2e095bd71be0290b7c99f0016c6bf4e authored almost 7 years ago

Throw ShortBufferException in RSA CipherSpi.

The Javadoc for javax.crypto.Cipher.doFinal() and friends states that
Ciphers should throw Short...

943238191685c85367fb0c51fb0a5f124b361876 authored almost 7 years ago

Snap for 4632767 from 9e2c31d348381281031d0f28cefe74879514d714 to pi-release

Change-Id: I776c48561f212c082614fcc405810871ea21d487

4bbbec8a06a588f595863db13df16970688f1fcc authored almost 7 years ago

Merge "Switch bouncycastle-nojarjar -> bouncycastle-unbundled." am: 70d9b6a2d8 am: e0053a88ef

am: 55af4817a8

Change-Id: I98647f9abe59ac337947e81c71e3b4922ee7fe3e

9e2c31d348381281031d0f28cefe74879514d714 authored almost 7 years ago

Merge "Switch bouncycastle-nojarjar -> bouncycastle-unbundled." am: 70d9b6a2d8

am: e0053a88ef

Change-Id: I0e9e16b373c8de675b73dbbd788b1020b0f5dbca

55af4817a842f0577a1feb7f2ab9e9bb049ceba6 authored almost 7 years ago

Merge "Switch bouncycastle-nojarjar -> bouncycastle-unbundled."

am: 70d9b6a2d8

Change-Id: I0070e246d157eb7e1fc1d8f5676e973757a0daca

e0053a88ef425853af4148aa1771f895c7060a2f authored almost 7 years ago

Merge "Switch bouncycastle-nojarjar -> bouncycastle-unbundled."

70d9b6a2d82bddbc02326c5998d37be82b1bc779 authored almost 7 years ago

Merge "AndroidDigestFactory: Simplify digest provider selection." am: 52b22f6074 am: 4dc0c31d01

am: 619fbcdbe3

Change-Id: I71f68588f818d967773ec6f9ab3e2a5ce15f1365

deb69a18c9142b4c672327ef381340d98e0c766a authored almost 7 years ago

Merge "AndroidDigestFactory: Simplify digest provider selection." am: 52b22f6074

am: 4dc0c31d01

Change-Id: I697b34eab3b07668a96090e019c0a668f485aa5c

619fbcdbe3c2f5af0c142e7e939c4d6984fe60be authored almost 7 years ago

Merge "AndroidDigestFactory: Simplify digest provider selection."

am: 52b22f6074

Change-Id: I4a94b52e6bbf159274304b4154230298b0c70948

4dc0c31d01abe2658df3bee2255713865c81e9de authored almost 7 years ago

Merge "AndroidDigestFactory: Simplify digest provider selection."

52b22f6074e8928a8b394afdc2483eb516a67a52 authored almost 7 years ago

Switch bouncycastle-nojarjar -> bouncycastle-unbundled.

The nojarjar versions and unbundled versions are very similar
in terms of their content, they're...

4e3766612a8acde36193b736e6d7d2f5dcd281c8 authored almost 7 years ago

AndroidDigestFactory: Simplify digest provider selection.

Helps simplify build rules and reasoning about unbundled versions
of BC etc. We now unconditiona...

efc7448fc6dc0ac7af9a8b58b7e70290f9e2a21d authored almost 7 years ago

Snap for 4628106 from 7de74d6317ad0689ffc30b8461e508f7b7fae353 to pi-release

Change-Id: I4dd41b5c63acd0ca481c259ed6bd1be5510390c6

26db53a188e4b35ae9771429e03d0ed6c12d7523 authored almost 7 years ago

Merge "Remove dependency on conscrypt from build rules." am: c57184a7f5 am: c69cf45a36

am: 3e1fd51e25

Change-Id: I11be4324d77843b61af4d885b5f5a22ed0e501e4

7de74d6317ad0689ffc30b8461e508f7b7fae353 authored almost 7 years ago

Merge "Remove dependency on conscrypt from build rules." am: c57184a7f5

am: c69cf45a36

Change-Id: Idf60c14a63f5e2038927acf745e8949faa96af34

3e1fd51e25e93cbecf26aac3d89dff1d72450680 authored almost 7 years ago

Merge "Remove dependency on conscrypt from build rules."

am: c57184a7f5

Change-Id: I087970f583df44ac3cd14353ff7aa21919b1642e

c69cf45a36c7c6ac387feab02e3e0773b63e53a4 authored almost 7 years ago

Merge "Remove dependency on conscrypt from build rules."

c57184a7f546cd89d5292741814e5dbd0ee1721f authored almost 7 years ago

Remove dependency on conscrypt from build rules.

Bouncycastle doesn't depend on conscrypt at build time. The only
reference to conscrypt is via a...

dc738435929d96f4012514e94c2cb0e4c5efffb4 authored almost 7 years ago

Snap for 4613997 from c53d92534c091324de6c42dfe27d60dc9c5e15c8 to pi-release

Change-Id: I56039c7730f2a2e0bbf6c34934205ff0fdfc5dd4

69b3be04198a0eb3c4dea9658e12c3c1c438df16 authored almost 7 years ago

Merge "Bouncycastle: Suppress MissingOverride warnings" am: da99ea9b0b am: 34052b062b

am: d4ad5d4a46

Change-Id: Id20a8e6f1fb9c299700557eceb75067bec749269

c53d92534c091324de6c42dfe27d60dc9c5e15c8 authored almost 7 years ago

Merge "Bouncycastle: Suppress MissingOverride warnings" am: da99ea9b0b

am: 34052b062b

Change-Id: Ieea8c25b56092faa25c1ca4c4ef95190fec9db34

d4ad5d4a46b3c370d255e2e7121e7f758f1499af authored almost 7 years ago

Merge "Bouncycastle: Suppress MissingOverride warnings"

am: da99ea9b0b

Change-Id: I1ea7b777dea846dd36d6353c0d901629bf786a7a

34052b062b714922d3e94ef7e2aaaba7db35c828 authored almost 7 years ago

Merge "Bouncycastle: Suppress MissingOverride warnings"

da99ea9b0b28db8392ea41bc495623942a99e39d authored almost 7 years ago

Bouncycastle: Suppress MissingOverride warnings

Bug: 73499927
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: I49ca417daf640d32f9327307ca4db...

5408b22fba28578d8a1d9314b817a4e7ce44b7d4 authored almost 7 years ago

Snap for 4590521 from cf806600f82c95bbf9f07cf5fff8754a15d330dd to pi-release

Change-Id: I645d500eab978967391370eb80dac02e34336aa0

e36027ff320f2033036f6e1e75b101d3e6f8c9d8 authored almost 7 years ago

Merge "Pin make target bouncycastle-bcpkix to java_version 1.7." am: d45ba34702 am: 437d641301

am: 0f126e97ce

Change-Id: Ib58110fb178cc0187e3be320fd2b65a87f939dd6

cf806600f82c95bbf9f07cf5fff8754a15d330dd authored almost 7 years ago

Merge "Pin make target bouncycastle-bcpkix to java_version 1.7." am: d45ba34702

am: 437d641301

Change-Id: I9068358ba6b47d87be370f4644d4f983dae2d8e5

0f126e97ce32218b6fa4693c2f23b51d90c202f9 authored almost 7 years ago

Merge "Pin make target bouncycastle-bcpkix to java_version 1.7."

am: d45ba34702

Change-Id: Id0c4230536922ba9d67f155ba9f10b0d57856790

437d641301cb1ce2cc0c2ac4a27b788ce88d8af0 authored almost 7 years ago

Merge "Pin make target bouncycastle-bcpkix to java_version 1.7."

d45ba347021babc62fb863581d1db7f412a7c65b authored almost 7 years ago

Pin make target bouncycastle-bcpkix to java_version 1.7.

This decouples the class file version fed to jarjar from the
current default class file version....

7a4f3d8c7388e354faaa7128d26e2510eb9d6597 authored almost 7 years ago

Snap for 4531101 from 4a506fd0492fd48681103b20fddfb6122944b511 to pi-release

Change-Id: Idc765e52bbccdc099906df60a386f1a69668abeb

7383df00b59fda1d3aae6a1985998b6072c2c139 authored about 7 years ago

Merge "Add new bouncycastle-ocsp-nojarjar rule." am: b024e33f99 am: 67ca012c89

am: 50d3890452

Change-Id: I80daae5ac774d5965d472c8942c25f836510ead9

4a506fd0492fd48681103b20fddfb6122944b511 authored about 7 years ago

Merge "Add new bouncycastle-ocsp-nojarjar rule." am: b024e33f99

am: 67ca012c89

Change-Id: I76f0a8040730f3997e17324c766df61526c49453

50d3890452b0b866e2f5eee18b9e6c96f11cc8d6 authored about 7 years ago

Merge "Add new bouncycastle-ocsp-nojarjar rule."

am: b024e33f99

Change-Id: Ide63b19572dbf6854b6471777eb150fec9d8c3b7

67ca012c89f80c0f0d2467dd3d5ece20c2d6d964 authored about 7 years ago

Merge "Add new bouncycastle-ocsp-nojarjar rule."

b024e33f994918db802b971d33e3411631eabbeb authored about 7 years ago

Add new bouncycastle-ocsp-nojarjar rule.

This rule will be needed for integrating with tests coming in from
Conscrypt, which use non-jarj...

9cb090f33cabd7ceb4564d26e58a524ed07ffa63 authored about 7 years ago

Snap for 4496165 from b53faa80b9aa6f439eca4bbe9679b46d2b9fa0a1 to pi-release

Change-Id: I8e039becc730cffff92422b4a6b14b6a13005453

3cb89bc8fed289ffcc328f4cced834ffff90bdd1 authored about 7 years ago

Merge "Log an error on BC PBE key misuse." am: f3df57364f am: 840bb56367

am: 9d5120d3d8

Change-Id: I6a31af0e5821012b7fc8308def6a0a69c553e8a2

b53faa80b9aa6f439eca4bbe9679b46d2b9fa0a1 authored about 7 years ago

Merge "Log an error on BC PBE key misuse." am: f3df57364f

am: 840bb56367

Change-Id: I27829da42add5646a50d8442cd267c51f447f081

9d5120d3d80654e3ffa98b65e57a8506f25d52ea authored about 7 years ago

Merge "Log an error on BC PBE key misuse."

am: f3df57364f

Change-Id: I211baff9eae6b3838167cddcf74bc0e72767a70f

840bb5636701943181e03bd297a05bfed2ec3ca7 authored about 7 years ago

Merge "Log an error on BC PBE key misuse."

f3df57364fab1d244d6b83bce963dc67ea66b37a authored about 7 years ago

Log an error on BC PBE key misuse.

When a BC cipher is initialized with a BC PBE key that has no IV and
an IV isn't passed in the p...

d07596fb6810cd74cf719bf6467b7bc96d07e9f9 authored about 7 years ago

Snap for 4476081 from 11d781b42cbfd770c254fa0f8d547d9d5b046465 to pi-release

Change-Id: Ic4a39c52a3c023bbca5db3066cd280c2f7174859

2c9132d1e210313a7862c7fe5cdec8fa12fc67a3 authored about 7 years ago

Merge "Have BC use default provider rather than always BC" am: 3785b10a6f am: 1e7f445027

am: 57dcdd84fd

Change-Id: I2c4ac3aa536639f447887b77e2facdc2eb81823a

11d781b42cbfd770c254fa0f8d547d9d5b046465 authored about 7 years ago

Merge "Have BC use default provider rather than always BC" am: 3785b10a6f

am: 1e7f445027

Change-Id: Id2159c4b7ac3faf726c0167800e38ae0b368c7e3

57dcdd84fdab3ac99c98e00e1ee74e1b887dcb39 authored about 7 years ago

Merge "Have BC use default provider rather than always BC"

am: 3785b10a6f

Change-Id: I5dbfc64526f44bc43aa8651850ffa7d3a545d070

1e7f44502711189e5f123b5be9aa86e67f1779ab authored about 7 years ago

Merge "Have BC use default provider rather than always BC"

3785b10a6f1f07cab00dbe5fa744638508d2ef28 authored about 7 years ago

Have BC use default provider rather than always BC

In cases where BC algorithms need access to other algorithms, switch to
using the default implem...

6b5b8b2f1e184da74aa4b2d083cb3f6a3c227844 authored about 7 years ago

Snap for 4453288 from 412b11b475a8c8d56fe256cf0ae5fbbfa8a3d38b to pi-release

Change-Id: I36f009cb25f7a51431ac05ac349e907d6904226d

999552530e80cbf7aa6d06a016fa3ad313b22130 authored about 7 years ago

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

am: 8b4851737a

Change-Id: Ic47c679af4906d881d639c001c6434a44f4670f8

412b11b475a8c8d56fe256cf0ae5fbbfa8a3d38b authored about 7 years ago

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I3965250e7d690f72fabd9f170a843c380f114a90

8b4851737ac8d8160cf9e83d078fc51f8bef5800 authored about 7 years ago

Merge commit 'ea672ac2f65a9b8aa175e4a8f6f1faa37a1ae224' into HEAD

Change-Id: I9cf9c213f2c2333d4eaa2dfbe7e87d2208c13847

b98eceb987ca0686f11e06c94a34b0f0b0cc2cba authored about 7 years ago

Snap for 4415813 from 67e44ec51913acba05f5c1f543b82076fbec9a39 to pi-release

Change-Id: I983bba84da459a3c93d071cb5327e4af6af06593

092c6a16c53aa1ee3ba30aaa7b2402d081a596f5 authored over 7 years ago

Ecosyste.ms: OpenCollective

github.com/PitchBlackRecoveryProject/android_external_bouncycastle