diff options
| author | Kenny Root <kroot@google.com> | 2014-04-30 16:24:42 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-04-30 16:24:42 -0700 |
| commit | 33aeb892a68274a5ec67f374f86c7b5cb06d1890 (patch) | |
| tree | ebcca163c2742545f84242590fa516e04a18178d /support | |
| parent | 6e729e08c5e8b3b91e4deaa86395abe113dbdf79 (diff) | |
| parent | 9687e46bcb2299492a55a97e0ddc1eb4db3517f8 (diff) | |
| download | libcore-33aeb892a68274a5ec67f374f86c7b5cb06d1890.tar.gz libcore-33aeb892a68274a5ec67f374f86c7b5cb06d1890.tar.bz2 libcore-33aeb892a68274a5ec67f374f86c7b5cb06d1890.zip | |
resolved conflicts for merge of 9687e46b to master
Change-Id: Iaeaea9b44423257e8ccbcf631f40720d3035cecd
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/tests/resources/hyts_signed_invalidChain.jar | bin | 3161 -> 3732 bytes |
| -rw-r--r-- | support/src/test/java/tests/resources/hyts_signed_validChain.jar | bin | 3167 -> 3732 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/support/src/test/java/tests/resources/hyts_signed_invalidChain.jar b/support/src/test/java/tests/resources/hyts_signed_invalidChain.jar Binary files differindex 2472dae5c..23d7ae8ab 100644 --- a/support/src/test/java/tests/resources/hyts_signed_invalidChain.jar +++ b/support/src/test/java/tests/resources/hyts_signed_invalidChain.jar diff --git a/support/src/test/java/tests/resources/hyts_signed_validChain.jar b/support/src/test/java/tests/resources/hyts_signed_validChain.jar Binary files differindex 67f3e875f..d1f4c5606 100644 --- a/support/src/test/java/tests/resources/hyts_signed_validChain.jar +++ b/support/src/test/java/tests/resources/hyts_signed_validChain.jar |