summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_libcore ↵HEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2016-12-1210-29/+303
|\ | | | | | | into replicant-6.0
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-092-4/+16
| |\ | | | | | | | | | | | | | | | | | | | | | CYNGNOS-3303 Android 6.0.1 release 74 Change-Id: I5d30d03599d97e81621add2516955ab40f1aeef7
| | * IDN: Fix handling of long domain names.Narayan Kamath2016-09-272-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge conflict into mnc-mr2-release We were incorrectly using sizeof() to calculate the size of the output array. Note that this change also changes the output size to 512 to minimize behavioural differences (especially wrt. ICU checks on sizes). bug: 30765246 Change-Id: I5d28ddc45d2d6d2bed3e479ca195ed2779b906ed
| * | Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-060-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.1 Release 72 (M4B30X) # gpg: Signature made Tue 04 Oct 2016 09:47:43 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| | * | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12Sergio Giro2016-08-161-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26231099 Bug: 26234568 Bug: 29876633 Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f
| * | | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-3/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:59 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| | * | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12Sergio Giro2016-07-211-3/+4
| | |/ | | | | | | | | | | | | | | | | | | Bug: 26231099 Bug: 26234568 Bug: 29876633 Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f
| * | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-0/+68
| |\ \ | | |/ | | | | | | | | | | | | | | | Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: Ib43d0956f24c0d3c4ce16ab3144f88c21c7feac2
| | * CipherTest: add test for multiple updateAAD callsKenny Root2016-03-251-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that multiple updateAAD calls are equivalent to other calls to updateAAD with the same data. (cherry picked from commit 67ee3c5c2dad218e497035de5100e9036d140fdd) Bug: 27371173 Change-Id: Ie69df0906438ad26c566daed3f55b07ba60fe468
| | * CipherTest: test instance reuse with updateAADKenny Root2016-03-251-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAD was not being reset on each Cipher init or doFinal call, so add regression tests to make sure that is now the case. (cherry picked from commit d90a44bf4956d335e2a876015cf258dc46e226ea) Bug: 27324690 Change-Id: I5f7606efb6dfcd412166eed2bd5f417097a97f1f
| * | XML Pull Parser optimizationsKevin Hart2016-04-201-8/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch includes three improvements to the pull parser. 1. readValue now only uses the stringPool for all-whitespace strings. Values are generally not repeated, and this function can thrash the string pool in some cases 2. Added a fast path for the normal, correct, end-tag case. This avoids a hash and lookup in the stringPool 3. While parsing an element (not attribute) name, the namespace and post-namespace strings are generated using the stringPool. This saves the cost of calling String.substring in adjustNsp. Change-Id: I69482a49bf52cb72d48bcbecd30fb56effe6a4ef
| * | Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-180-0/+0
| |\ \ | | |/ | | | | | | | | | Ticket: RM-234 Android 6.0.1 release 30
| | * GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-02-261-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | Note: port of cr/110497945 Bug: 26231099 Bug: 26234568 Change-Id: I3eef233b15ded9553c3cdfd1c51ffef306276f7d
| * | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-0/+22
| |\ \ | | | | | | | | | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| | |\ \
| | | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-170-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-03-011-0/+22
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: port of cr/110497945 Bug: 26231099 Bug: 26234568 Change-Id: I3eef233b15ded9553c3cdfd1c51ffef306276f7d
| * | | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-106-17/+130
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/libcore into cm-13.0 Android 6.0.1 release 22
| | * | Check for RFC 5746 TLS extensionKenny Root2016-01-062-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 5746 allows you to either include a signaling cipher suite or a TLS extension. However, since TLS API has no way to indicate or check that a certain TLS extension is used, we insert it into the cipher suites we see to check against the enabled cipher suites. (cherry picked from commit 81885494e46596c796cdcb5037b91d92915b65a7) Bug: 24602368 Change-Id: I06422b9a90f47bb5ffa10ef614233d856773d336
| | * | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev ↵Daniel Xie2015-12-211-2/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d0ae2ffcb6 am: 1e6284ec29 am: 762c0d8cc3 * commit '762c0d8cc3761d0f91063d6f7e2512de06f83f63': Change FinalizeTest to use helper function
| | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev ↵Daniel Xie2015-12-211-2/+7
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d0ae2ffcb6 am: 1e6284ec29 * commit '1e6284ec29aff9eb30ef00eedea2f786ac95b9ca': Change FinalizeTest to use helper function
| | | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-devDaniel Xie2015-12-211-2/+7
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d0ae2ffcb6 * commit 'd0ae2ffcb6246651504c36fec93f9c1fdcef0d4b': Change FinalizeTest to use helper function
| | | | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-devDaniel Xie2015-12-211-2/+7
| | | | | |\ \
| | | | | | * | Change FinalizeTest to use helper functionMathieu Chartier2015-12-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old way kept the object live in a vreg. Bug: 25851249 (cherry picked from commit cf3d432790a78b7d81da656f9a666f3d1ce4962c) Change-Id: I3cefd317e23c602c6c74dd866f0831161ef10962 (cherry picked from commit 8210c23a598b363e89d6cd32dedeeae673bf9212)
| | * | | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev ↵Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 779c726a7a am: a289f96778 am: 9c763fb49d -s ours am: 1c48ac828e am: 14fdf89b34 am: 45db0660a0 * commit '45db0660a02f7cd613495b497ab3bac0bc28e5ba':
| | | * | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev ↵Daniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 779c726a7a am: a289f96778 am: 9c763fb49d -s ours am: 1c48ac828e am: 14fdf89b34 * commit '14fdf89b34cb0b41d9c1094724856a82b59953ba':
| | | | * | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev ↵Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 779c726a7a am: a289f96778 am: 9c763fb49d -s ours am: 1c48ac828e * commit '1c48ac828ee205a8bd8052a6f17adfb965790432':
| | | | | * | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev ↵Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 779c726a7a am: a289f96778 am: 9c763fb49d -s ours * commit '9c763fb49d7155a2251a582d0a2ecce4d6c9120a':
| | | | | | * \ \ Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev ↵Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 779c726a7a am: a289f96778 * commit 'a289f96778cf5e88406d6ccc8e85865fbe1d9f45': Fixes associated with the tzdata 2015a update
| | | | | | | * \ \ Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-devDaniel Xie2015-12-060-0/+0
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 779c726a7a * commit '779c726a7a24ae169cefacf2aa91cc54139a96ec': Fixes associated with the tzdata 2015a update
| | * | | | | | \ \ \ Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c am: 0b8078f8b9 am: 960a6e939b am: 33d3334d17 am: 2751cbfbdd am: 3f4743b38d * commit '3f4743b38d29ad0902e122b274b11d1cfe242ede':
| | | * | | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c am: 0b8078f8b9 am: 960a6e939b am: 33d3334d17 am: 2751cbfbdd * commit '2751cbfbddbc02987f5cb64d697c087b490eb447':
| | | | * | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c am: 0b8078f8b9 am: 960a6e939b am: 33d3334d17 * commit '33d3334d178d3f671d60102437a15d62f27f0745':
| | | | | * | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c am: 0b8078f8b9 am: 960a6e939b * commit '960a6e939b19b1e605624c5261bbbda67ea26116':
| | | | | | * | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c am: 0b8078f8b9 * commit '0b8078f8b9cd096e6d104a04e9e381c94fe3c106': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | | | | | * | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-061-36/+15
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c * commit '1d1abc5b0ccf31e79aa7173b2e592b7e52b3e519': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | * | | | | | \ \ \ \ Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours am: bcd9db7050 am: cb245d2936 am: d9f9980541 am: bebfb25f88 am: f7fe8aaf72 * commit 'f7fe8aaf72b3a1e4eab900583a82d463552113aa':
| | | * | | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours am: bcd9db7050 am: cb245d2936 am: d9f9980541 am: bebfb25f88 * commit 'bebfb25f88e18206a5f9c5ad06d61ca9a5bff848':
| | | | * | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours am: bcd9db7050 am: cb245d2936 am: d9f9980541 * commit 'd9f9980541cf95e316f952e19e0f36ac8dc968e8':
| | | | | * | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | / / | | | | | | |_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours am: bcd9db7050 am: cb245d2936 * commit 'cb245d2936763d1bea1842774fe51f178a0fa697':
| | | | | | * | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours am: bcd9db7050 * commit 'bcd9db7050124d4d8bbd9b732f43efd3291b4aa4': Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318
| | | | | | | * | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-060-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours * commit '70a463cbfe0aac6bc88a46b3b103e40d70ff3abf': Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318
| | * | | | | | \ \ \ \ Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: ↵Daniel Xie2015-12-032-12/+103
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1117338720 am: cf4b283f02 am: a573f3040b * commit 'a573f3040bc603b860783076db30f75eeea319ab': Add more debugging to the DigestTest
| | | * | | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: ↵Daniel Xie2015-12-032-12/+103
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1117338720 am: cf4b283f02 * commit 'cf4b283f02bdd2b17bc61e952d58a705dee81ba7': Add more debugging to the DigestTest
| | | | * | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devDaniel Xie2015-12-032-12/+103
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1117338720 * commit '11173387202f799fad05bf696b81ca7f379e11dc': Add more debugging to the DigestTest
| | | | | * | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devDaniel Xie2015-12-032-12/+103
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Add more debugging to the DigestTestKenny Root2015-10-272-12/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test sometimes fails, but we don't know what the coefficient of variation is on the test results. Add this to the debug output so we can see if there is just some wild swing during testing. Also add a few rounds of warm-up as well. Bug: 24011092 Change-Id: Ic58f106f68eb93976e3f030e2f23e0156fe84be8 (cherry picked from commit 5fe1cd001f38fba460ac0ce5c15b85250e400f25)
| | * | | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into ↵Daniel Xie2015-12-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marshmallow-cts-dev am: 79810ceebb am: 0730bd1afd am: dbb8202b05 * commit 'dbb8202b051b096040ef12d794cf1f580dd0974a': Fix time calculation in test_SSLSession_getLastAccessedTime
| | | * | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into ↵Daniel Xie2015-12-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marshmallow-cts-dev am: 79810ceebb am: 0730bd1afd * commit '0730bd1afdb33005daa26cd7b032c057cb9698f5': Fix time calculation in test_SSLSession_getLastAccessedTime
| | | | * | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into ↵Daniel Xie2015-12-031-1/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marshmallow-cts-dev am: 79810ceebb * commit '79810ceebb071f7a52999783de2a3a529071bb93': Fix time calculation in test_SSLSession_getLastAccessedTime