Ecosyste.ms: OpenCollective

An open API service for software projects hosted on Open Collective.

github.com/PitchBlackRecoveryProject/android_external_bouncycastle


https://github.com/PitchBlackRecoveryProject/android_external_bouncycastle

Merge "Only match on exactly GCM mode"

584f3b23aa2adc076c3151ff94957d3e71d1724f authored over 5 years ago
Fix srcgen problems in BC

The core-platform-api.txt file contained "Sha1Digest" while the class
was named "SHA1Digest", so...

a39e15c4ac3e023172e41c8162996a8e564d6486 authored over 5 years ago
Only match on exactly GCM mode

In Conscrypt, we're adding AES/GCM-SIV/NoPadding as a cipher, which is
a different cipher than A...

3bbf9b5a36bfc4a491631b033417e3cb0d19bf6b authored over 5 years ago
Merge "Cherrypick BigIntegers code from BouncyCastle v1.62." am: c65e37c89a am: 2bdee55210 am: 825c4e97bd

am: cb02efc4ff

Change-Id: I78f6b13b13cabae393141ae05f61626db0d8c855

b6754aa1df40cb5a61ff1c9364a9a95447cc5792 authored over 5 years ago
Merge "Cherrypick BigIntegers code from BouncyCastle v1.62." am: c65e37c89a am: 2bdee55210

am: 825c4e97bd

Change-Id: I1ea7a6d851ccc62d1e6fa7b5e35b3c6cf450833c

cb02efc4ff148e14e811e005e277f6ce06e4063c authored over 5 years ago
Merge "Cherrypick BigIntegers code from BouncyCastle v1.62." am: c65e37c89a

am: 2bdee55210

Change-Id: Ie2e2244cb83b7b86ae9e804400cfce37f30fa715

825c4e97bdd706bf6b17b2909b3543a1d30c694e authored over 5 years ago
Merge "Cherrypick BigIntegers code from BouncyCastle v1.62."

am: c65e37c89a

Change-Id: Ie0a6ee4814c87d74a07fe33a5e0637c4c0895cc4

2bdee552101154a71a805af75d2e0c4dbd262da3 authored over 5 years ago
Merge "Cherrypick BigIntegers code from BouncyCastle v1.62."

c65e37c89a98692e518282a6621a1259026f35b8 authored over 5 years ago
Cherrypick BigIntegers code from BouncyCastle v1.62.

Contains performance fixes to this class made between
BC version 1.61 (latest in AOSP) and 1.62 ...

3e10d60db4dd81ab376be4a1d4f770589de39eb6 authored over 5 years ago
Merge "Expose some SHA1Digest methods for FIPS 186-2 PRF" am: d7e9756c38 am: e50b56578a am: b240471350

am: 00b150529e

Change-Id: I7bfcacce26a0f24c4379419ac2e7c0e9e607c9a5

cf7fd7f1a8034b1ddbc59e550f272922f2b884ab authored over 5 years ago
Merge "Expose some SHA1Digest methods for FIPS 186-2 PRF" am: d7e9756c38 am: e50b56578a

am: b240471350

Change-Id: Id3d6a31f74ca584d31f1c52f353d017dc9139887

00b150529ea56303e4d690a6cd974f31bd09a61a authored over 5 years ago
Merge "Expose some SHA1Digest methods for FIPS 186-2 PRF" am: d7e9756c38

am: e50b56578a

Change-Id: I998e59b1ea33e28eacb64c4bc4098e232acf7b11

b2404713507e5ae3b664fa4fa1c26c58b4326040 authored over 5 years ago
Merge "Expose some SHA1Digest methods for FIPS 186-2 PRF"

am: d7e9756c38

Change-Id: I20cb961e784a48ee9614215eccc4d2b3156832e1

e50b56578ac2c34d56c44f30aac04b0810038fb1 authored over 5 years ago
Merge "Expose some SHA1Digest methods for FIPS 186-2 PRF"

d7e9756c384c9c65ad5e35af939bdebf755fd762 authored over 5 years ago
Expose some SHA1Digest methods for FIPS 186-2 PRF

The FIPS 186-2 PRF required by EAP-SIM and EAP-AKA (used in telephony)
require a hashing functio...

7d795a6f6a0865a7fcd17deafab881d1a220676f authored over 5 years ago
Merge "Set default visibility to private" am: 263ceb5cfd am: a82a0630ce am: 08363776bd

am: 1b964b68a2

Change-Id: I478878cc06553ba7a883f209c947d2ae8278b63e

707e93ef0206c0d8fd50c2138540b9c9cfee6b20 authored over 5 years ago
Merge "Set default visibility to private" am: 263ceb5cfd am: a82a0630ce

am: 08363776bd

Change-Id: I293acd339aeeb7547b94c41e2915c16c3fbe30ad

1b964b68a2891085b4c2689f4abe5bf6d8ba6856 authored over 5 years ago
Merge "Set default visibility to private" am: 263ceb5cfd

am: a82a0630ce

Change-Id: I628b8f5b76fa17f66842221c6e62791c7d15bbe5

08363776bde73a4240fbbbc88fddfd44985f4e92 authored over 5 years ago
Merge "Set default visibility to private"

am: 263ceb5cfd

Change-Id: I36b8b43511731463bcae3fcf8dc0d6d5985e6e94

a82a0630ce5fcda3162bc44e1208a3ae258b6e86 authored over 5 years ago
Merge "Set default visibility to private"

263ceb5cfd0c3a572b004d3c95cfec7b947363f9 authored over 5 years ago
Merge "Enforce consistent formatting of .bp files" am: eed35ec703 am: 444635f880 am: 1039c5b172

am: 303928b6a1

Change-Id: Ibc1c1af23b71c6d9182b1752e6f14f18e220b9e0

0c536af5b047dd39b30e2d5ae3b646fb1a5ee52c authored over 5 years ago
Merge "Enforce consistent formatting of .bp files" am: eed35ec703 am: 444635f880

am: 1039c5b172

Change-Id: I176c9a2992df7da69a08daa036821c8754cec05e

303928b6a1897d6e4b53bf605263b1df7c5b6abe authored over 5 years ago
Merge "Enforce consistent formatting of .bp files" am: eed35ec703

am: 444635f880

Change-Id: I3a8113a0b432bede1233133c6658befb58da4273

1039c5b1724fe2ad9f0ae218cd4713270c958af2 authored over 5 years ago
Merge "Enforce consistent formatting of .bp files"

am: eed35ec703

Change-Id: I88233b045f4009185cb5ce4023bbb30452d0722e

444635f880f8c19e56e95c67598ea0070b5ea5de authored over 5 years ago
Merge "Enforce consistent formatting of .bp files"

eed35ec7035a33c6f05f6992403ccfbee2a407f0 authored over 5 years ago
Enforce consistent formatting of .bp files

Test: attempt to checking in badly formatted .bp file
Change-Id: I9113f42b3db6d8e83f9422671c7d2d...

76cdee9a01d2b0aa87226c56ae4bf6e166745433 authored over 5 years ago
Set default visibility to private

Takes advantage of a new mechanism for specifying the default visibility
of all modules in a pac...

eb463f384c0650ae5e311943403a193b429ee108 authored over 5 years ago
Merge "Switch from no_standard_libs:true to sdk_version:"none"" am: ea2e58bec8 am: 6adfc28a9a am: 2043ef44cc

am: 5d3cc94a2b

Change-Id: I084725b0f211eb9a57f0166d8d7f5d5fa43baf52

948abaedff66b97f844751762f9e252acd59b293 authored over 5 years ago
Merge "Switch from no_standard_libs:true to sdk_version:"none"" am: ea2e58bec8 am: 6adfc28a9a

am: 2043ef44cc

Change-Id: Ic20c60691b3b4a1493f041cf7a34bffcae85532a

5d3cc94a2b5e6c7a68834f7ce576a6f4e69da422 authored over 5 years ago
Merge "Switch from no_standard_libs:true to sdk_version:"none"" am: ea2e58bec8

am: 6adfc28a9a

Change-Id: I9e5d958c798a09ad6a2eadd870e09b86e2798802

2043ef44ccda7f42456b8dc918476b4fc891d190 authored over 5 years ago
Merge "Switch from no_standard_libs:true to sdk_version:"none""

am: ea2e58bec8

Change-Id: I6a2ba1bcb97e4b0f7150d62d40cf7c6ac73ea26f

6adfc28a9a28eb5dcf5eadc32475fbbe5733cf15 authored over 5 years ago
Merge "Switch from no_standard_libs:true to sdk_version:"none""

ea2e58bec896a084e8a4d5717df11753c1c6e4ef authored over 5 years ago
Switch from no_standard_libs:true to sdk_version:"none"

The no_standard_libs property is deprecated in favor of
sdk_version:"none" as the latter is simp...

322ebdfd456b591e5ed360a1d947647b15d13394 authored over 5 years ago
[automerger skipped] Upstream partner request to add BC methods to core platform API. am: 7f36859267 -s ours

am: cc56bccab3 -s ours
am skip reason: change_id Ia31cb34b09a6759da739b821deba7f0e82a57041 with S...

315678812f45b211ebee15ca3ac8d5dc55de3f93 authored over 5 years ago
[automerger skipped] Upstream partner request to add BC methods to core platform API.

am: 7f36859267 -s ours
am skip reason: change_id Ia31cb34b09a6759da739b821deba7f0e82a57041 with S...

cc56bccab3d27a23a2f85b01c8c30d081d08b798 authored over 5 years ago
Merge "Upstream partner request to add BC methods to core platform API." am: b04cf2d8c7 am: 5540beddd7

am: 4c8eef617d

Change-Id: I29a216e12e87397bcc4e8a36aaeb7001375da0a6

524d724065b945e46c585708b6427ed49b18b5ca authored over 5 years ago
Merge "Upstream partner request to add BC methods to core platform API." am: b04cf2d8c7

am: 5540beddd7

Change-Id: Ifebcdc579baa42734b29387851d83e77fd07837f

4c8eef617daddb94b812618a7b38c2a129d1d923 authored over 5 years ago
Upstream partner request to add BC methods to core platform API.

This change adds methods and a field inadvertently missed in
http://r.android.com/954559 and htt...

7f368592677d262880b2016bddc3ce29f9c459cf authored over 5 years ago
Merge "Upstream partner request to add BC methods to core platform API."

am: b04cf2d8c7

Change-Id: I6b7e8448854044093229eaf60852f4deb4203e20

5540beddd74f2d87865962817d9f36b5fccb222b authored over 5 years ago
Merge "Upstream partner request to add BC methods to core platform API."

b04cf2d8c7d74de67fca70af3611873974d73a72 authored over 5 years ago
Upstream partner request to add BC methods to core platform API.

This change adds methods and a field inadvertently missed in
http://r.android.com/954559

Bug: 1...

5df38692a9fc3ba2f140f1d98c6dff424c398615 authored over 5 years ago
[automerger skipped] Upstream partner request to add BC methods to core platform API. am: fa8c9cdbe0 -s ours

am: 6641214ae0 -s ours
am skip reason: change_id Ia4b081f7f240ccc52177c1b7fea29cf48261da75 with S...

8ef8e2e70933c005eedb3fc3e2a114ee8751e2ec authored almost 6 years ago
[automerger skipped] Upstream partner request to add BC methods to core platform API.

am: fa8c9cdbe0 -s ours
am skip reason: change_id Ia4b081f7f240ccc52177c1b7fea29cf48261da75 with S...

6641214ae08518033c942b8a9aaaf1884f13252d authored almost 6 years ago
Merge "Upstream partner request to add BC methods to core platform API." am: fc3983f6a4 am: 3c91462d33

am: af465c99e7

Change-Id: Ia113b8255f8a26ad10b74e975095cf46b47b0ea2

c7beee9fe8351e774aec8f010aca9f5afa41c457 authored almost 6 years ago
Upstream partner request to add BC methods to core platform API.

Bug: 129665886
Bug: 129440746
Test: m && flashall
Change-Id: Ia4b081f7f240ccc52177c1b7fea29cf482...

fa8c9cdbe04a06ea02a04cef4e81b8dc70e08113 authored almost 6 years ago
Merge "Upstream partner request to add BC methods to core platform API." am: fc3983f6a4

am: 3c91462d33

Change-Id: Id1abbf9b4f1b244d80c76672e507e805e4ad01a4

af465c99e7e5c47264ae0d65e15a7b060d1e2abb authored almost 6 years ago
Merge "Upstream partner request to add BC methods to core platform API."

am: fc3983f6a4

Change-Id: I995e8d5926064ae9e8940d87750e19b9e3e6ed93

3c91462d33a7535541e5657c694b79722a9f7b04 authored almost 6 years ago
Merge "Upstream partner request to add BC methods to core platform API."

fc3983f6a4c9491d0c7a86408f3336ded3f98c27 authored almost 6 years ago
Upstream partner request to add BC methods to core platform API.

Bug: 129665886
Bug: 129440746
Test: m && flashall
Change-Id: Ia4b081f7f240ccc52177c1b7fea29cf482...

d1cc1bde893a4d7013a5f22daee5a00a19107d78 authored almost 6 years ago
Merge "Add core library modules visibility rules" am: 043bacd9ca am: 8d94dff156

am: 86b45f0543

Change-Id: I2b3efc34d50a0b5694c6b178074e28fd7d675938

8f44d9e5139ee6b69d55e57b58f940563d849912 authored almost 6 years ago
Merge "Add core library modules visibility rules" am: 043bacd9ca

am: 8d94dff156

Change-Id: Iea847d682c8631f2787447caf6069ca2c32f6523

86b45f05433c2ee946ffb1960769553b084b271e authored almost 6 years ago
Merge "Add core library modules visibility rules"

am: 043bacd9ca

Change-Id: Ib47508eb8f8a87f83132fac190cbd7daa2f99e74

8d94dff1565b7e68843d6e45f45e7d9114c9df7b authored almost 6 years ago
Merge "Add core library modules visibility rules"

043bacd9ca77d4a797f5296459b3966288c74d25 authored almost 6 years ago
Add core library modules visibility rules

Adds visibility to core library modules to prevent them from being
accessed unnecessarily.

Bug:...

5d5c19b46eebb6d924641eacf513ee94d2950a89 authored almost 6 years ago
Merge "Use tools/currysrc/scripts/repackage-common.sh" am: 14f0dbd296 am: f198bc7bf3

am: d81905c105

Change-Id: Ifbe04362d04a640fa13bd6ab4d5a3ddfa8b424ab

18b643d778ffedee48ca251c1071a37f8a5134df authored almost 6 years ago
Merge "Use tools/currysrc/scripts/repackage-common.sh" am: 14f0dbd296

am: f198bc7bf3

Change-Id: I84a9b20a1b76b83d52791ea0fcf2a7dccf331aa3

d81905c105db9d8523e693826347cfa43d95bfd7 authored almost 6 years ago
Merge "Use tools/currysrc/scripts/repackage-common.sh"

am: 14f0dbd296

Change-Id: I452d859f13b8d7ca680d67282a4a2eb158f960a7

f198bc7bf35d5a91e0fc40683964d0f5ff3ce567 authored almost 6 years ago
Merge "Use tools/currysrc/scripts/repackage-common.sh"

14f0dbd296a79a67d4993bacaa01f3671340e8d0 authored almost 6 years ago
Use tools/currysrc/scripts/repackage-common.sh

The repackage-common.sh script provides support for using the
RepackagingTransform which reduces...

6e47557f05eb71ddfdd6098c202acd7aa55adc65 authored almost 6 years ago
Merge "Remove DH keygen special case" am: 151ca156c5 am: cabf9a8310

am: a9b7a58bf1

Change-Id: I78110c3906f27236179e9ece5f065af4c83f460e

74b4ca16b4f051db24ea04b5a076e387f3d799ef authored almost 6 years ago
Merge "Remove DH keygen special case" am: 151ca156c5

am: cabf9a8310

Change-Id: Ia65c29d05e0720bcca4e1c0a3eee914a72a3cf49

a9b7a58bf113c6df8b02b314acd83b381671d62e authored almost 6 years ago
Merge "Remove DH keygen special case"

am: 151ca156c5

Change-Id: I1cb9f5c294858e0ab8ffeadbce83f7c75119564e

cabf9a8310f3b538786a5c0e3d827b819e2c00b4 authored almost 6 years ago
Merge "Remove DH keygen special case"

151ca156c5e7723d591ca3be0f98f30f0c86a294 authored almost 6 years ago
Remove DH keygen special case

BC added an optimization for a BC-specific key generation params class
that ultimately causes Wy...

68597d6c545b7f94878cce394a633f186a3f1e56 authored almost 6 years ago
Merge stage-aosp-master into pi-dev-plus-aosp

am: e544a57c14

Change-Id: Ie3134beb6a8611e315a8a3bb4e9620edbcedfe84

3d9d9178f8d746f0dc52ceba687ca6d28482f480 authored almost 6 years ago
Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: I53699d869702863d8b6ba9febc602a408841b128

e544a57c1487013bfce07d9363366c7baa39face authored almost 6 years ago
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I0cc6e7a2bca9f6e5ec47636c40fac33661b24f76

ecdc66b850c597c40d84c23e4804eb274c57f9d2 authored almost 6 years ago
Merge "Update Bouncy Castle to 1.61" am: e068c5363c am: 5fef79a4c1

am: d3f3d68a1d

Change-Id: Ie311810a9b2bb288c891d6eb7170c9fed427a043

ded03f7dec7f77a19d3ec49dc9129736601aa981 authored almost 6 years ago
Merge "Update Bouncy Castle to 1.61" am: e068c5363c

am: 5fef79a4c1

Change-Id: I6cf229f5793e0d8098a760ae8c1b38825be89e23

d3f3d68a1db9eaabd3a2e9ba253feab49016c222 authored almost 6 years ago
Merge "Update Bouncy Castle to 1.61"

am: e068c5363c

Change-Id: Ie3a5b2d5ec41f791316e718a2da5812e7400fba1

5fef79a4c13c45b514bc5f2784d4d7cb604a6d4c authored almost 6 years ago
Merge "Update Bouncy Castle to 1.61"

e068c5363c2fd4e1b0ed9928628df1a6ca06ce93 authored almost 6 years ago
Update Bouncy Castle to 1.61

Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreWycheproofBCTestCases
Change-Id: Ifcd182...

27254450f01adef5f4bb25a648d42eeacc14c438 authored almost 6 years ago
Merge "Fix the spelling error in ReasonsMask" am: bdfb209e7c am: 0ddee15eff

am: 69f07d10ee

Change-Id: I5df97745051c9badcee9fc70615d52e6a698ae17

46029f89d1e0f665f981444570edf3fb26b866a0 authored almost 6 years ago
Merge "Fix the spelling error in ReasonsMask" am: bdfb209e7c

am: 0ddee15eff

Change-Id: I169c3fc039ab9d7bd258d7881d16a8dcf579b577

69f07d10ee6fbe741876972bcccee85d382e4c20 authored almost 6 years ago
Merge "Fix the spelling error in ReasonsMask"

am: bdfb209e7c

Change-Id: Icd31ccf747b6c8839c0df541ca3336a1d27d13a6

0ddee15eff5b13bf5477606c6cef55fde37a382f authored almost 6 years ago
Merge "Fix the spelling error in ReasonsMask"

bdfb209e7c1139588c82722a809c46667775a314 authored almost 6 years ago
Fix the spelling error in ReasonsMask

This fixed the warning that is being printed by metalava:
external/bouncycastle/repackaged/bcpro...

e94f7602959cb600754eafeb31733ab11503b4f5 authored almost 6 years ago
Merge "bouncycastle: Android tree with upstream code for version 1.61" into upstream-master

1b335c5efbcf241b55345622fe9978047c3fdf9e authored almost 6 years ago
bouncycastle: Android tree with upstream code for version 1.61

Test: no tests needed, this branch is only for diffing against upstream
Change-Id: I229752afcbb6...

11b8b14a2780c41215bdb706f63def6ad4faa463 authored almost 6 years ago
Merge "Build bouncycastle for default java version" am: 6e7c76e5eb am: d701467efc

am: 9e5a194930

Change-Id: I70773db09978b89d00b1c104000a0f03d4d9022a

d5820c07d7f1c46880d29fc78c054a6a730965e2 authored about 6 years ago
Merge "Build bouncycastle for default java version" am: 6e7c76e5eb

am: d701467efc

Change-Id: I8279e1da0ecd68539b3305e08f299c62bfea1bd7

9e5a194930c7328641c0baa67288247032c64101 authored about 6 years ago
Merge "Build bouncycastle for default java version"

am: 6e7c76e5eb

Change-Id: I93ca604af2f774c77acc89aec97709ccd37b239f

d701467efc552181ba5aec0ef628affab490d9d2 authored about 6 years ago
Merge "Build bouncycastle for default java version"

6e7c76e5eb7589e7bbecd3ce3326611bf30328ad authored about 6 years ago
Build bouncycastle for default java version

Due to limitations with jarjar the bouncycastle target was built for
java 1.7. Now that it no lo...

37497651d412e4243c71a010e353987398b48c15 authored about 6 years ago
Merge "Keep dex files in bouncycastle-testdex.jar." am: 7b8d1def55 am: b41899c06f

am: dd8aab40a3

Change-Id: I6ad305d6624fa9075719ae733406a55644aa7c64

7082ef243545869c666ed095b7596cc478d179ec authored about 6 years ago
Merge "Keep dex files in bouncycastle-testdex.jar." am: 7b8d1def55

am: b41899c06f

Change-Id: Ifb514fa51174709d1465e625d0342433e77d82b9

dd8aab40a32bdee33de2bb4a122159c878cbe635 authored about 6 years ago
Merge "Keep dex files in bouncycastle-testdex.jar."

am: 7b8d1def55

Change-Id: I2bf7e99f8e15c13b62e0eff73f10d8ddb87614dd

b41899c06f71e119aede0e7841893f65ce65ffbc authored about 6 years ago
Merge "Keep dex files in bouncycastle-testdex.jar."

7b8d1def552de9bf8d9cd5fa74f002450bf4a78b authored about 6 years ago
Keep dex files in bouncycastle-testdex.jar.

The sole "raison d'être" of the *-testdex.jar files is to
provide a version with dex files when ...

3fa41f20af6e048ac0e767937ba42942ec4e36a7 authored about 6 years ago
Merge "Move android_bcprov to repackaged/bcprov" am: bd5602c088 am: b0f04bfa14

am: 7357f9df6a

Change-Id: I7860cac02d5890eaded1ed59f11f97fb5e72c881

6cae11e5305bea479aef7af161493c01d07a5eb7 authored about 6 years ago
Merge "Move android_bcprov to repackaged/bcprov" am: bd5602c088

am: b0f04bfa14

Change-Id: If5111fb3b4b2db44c8484e76301a8e070315a1b4

7357f9df6ab94d92f1a64d98cb289d7da5a6fcae authored about 6 years ago
Merge "Move android_bcprov to repackaged/bcprov"

am: bd5602c088

Change-Id: If923e2bbc7301417675414729da0995fe2ae0e1b

b0f04bfa14457e5a392dd6664f494feaee69eed8 authored about 6 years ago
Merge "Move android_bcprov to repackaged/bcprov"

bd5602c088259bc3478f7e369a4364cfcd515b3b authored about 6 years ago
Move android_bcprov to repackaged/bcprov

This is needed to provide consistency between bouncycastle and other
users of RepackagingTransfo...

6eec96b310861c8392330a3a56e4ec30766f1f62 authored about 6 years ago
Merge "Add missing default constructors" am: 718d6a1c5c am: 03087da574

am: c625f99da2

Change-Id: I95e3c3b71216b8c01c5b80c487b8a5ceceea2267

db328bc41b8d82cd1c66d75f36a45d2b30a76d81 authored about 6 years ago
Merge "Switch from block comments to line comments" am: bf85c93a1d am: ad6ef7fb91

am: 59d9868f00

Change-Id: I9e861e7ccd55802251796e3885653e651e52ebbe

fbe0e31908986139c7050fd69dcebf203e1da880 authored about 6 years ago
Merge "Add missing default constructors" am: 718d6a1c5c

am: 03087da574

Change-Id: I3a5124e8976e2a7ac4ebac05e8327d3a495a83cb

c625f99da2b2d6145b1476fcc4d1f9ee91130812 authored about 6 years ago
Merge "Switch from block comments to line comments" am: bf85c93a1d

am: ad6ef7fb91

Change-Id: I7daa4ea607a4650e86179de3177daa236e602b64

59d9868f0059ea71d4b633ef965cfa9ebef0351a authored about 6 years ago
Merge "Add missing default constructors"

am: 718d6a1c5c

Change-Id: I0c1bf80d4032d99aef86ed11676fed815d5687a2

03087da574ca7945b22ed127ea17febdc8f4940a authored about 6 years ago
Merge "Switch from block comments to line comments"

am: bf85c93a1d

Change-Id: I2a4dedebdf97005da2e9500677a28e810ba6ecd8

ad6ef7fb91053a02f8754a8a9c0d6e3750f1487c authored about 6 years ago