summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fix time calculation in test_SSLSession_getLastAccessedTimezhulin09102015-10-301-1/+1
|/ | | | | | | | | | | | | | | [root cause] Time precision in NativeCrypto SSL_SESSION_get_time is second, ignore millisecond. Then, assertTrue( Math.abs(s.server.getLastAccessedTime() - s.client.getLastAccessedTime()) < 1 * 1000); is not rigorous. [changes] modify diff time of s.server.getLastAccessedTime() and s.client.getLastAccessedTime() <= 1*1000 Bug: https://code.google.com/p/android/issues/detail?id=183898 (cherry picked from commit 3f49882b1d3316e37d8312d707c29261d14ece65) Change-Id: Ib0d5eb512f717f1fd88818eac5bf8ef0e5cbac6b
* am 8c894eed: am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am ↵Daniel Xie2015-10-090-0/+0
|\ | | | | | | | | | | | | fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev * commit '8c894eedbbef6ccc2b9dec6b66b25e4e0b8ab0f9': Fixes associated with the tzdata 2015a update
| * am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am ↵Daniel Xie2015-10-090-0/+0
| |\ | | | | | | | | | | | | | | | | | | 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev * commit '58ca9e818aad8403fca76661327d285e613079c1': Fixes associated with the tzdata 2015a update
| | * am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am ↵Daniel Xie2015-10-080-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev * commit '74b5e0622b55eb4e3812b076ef546c0408af331c': Fixes associated with the tzdata 2015a update
| | | * am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am ↵Daniel Xie2015-10-080-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev * commit 'f6a672c74ffa7322c19e9436cd9b92f981e35d84': Fixes associated with the tzdata 2015a update
| | | | * am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge ↵Daniel Xie2015-10-080-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev * commit 'b266f2c0e1979f5fd7c899e16b7789a6fed4073e': Fixes associated with the tzdata 2015a update
| | | | | * am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated ↵Daniel Xie2015-10-080-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the tzdata 2015a update" into kitkat-cts-dev * commit 'fd2df1465574af82a0ae582e9a9e27c1b4db77da': Fixes associated with the tzdata 2015a update
| | | | | | * am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the ↵Daniel Xie2015-10-081-8/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tzdata 2015a update" into kitkat-cts-dev * commit '917c8e090576829ba0db6da4510e460ea44d806e': Fixes associated with the tzdata 2015a update
| | | | | | | * am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a ↵Daniel Xie2015-10-081-8/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into kitkat-cts-dev * commit 'fe790a73fb7c0ec9773f591a281ab1dbb2c8ed93': Fixes associated with the tzdata 2015a update
| | | | | | | | * am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into ↵Daniel Xie2015-10-081-8/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev * commit '779c726a7a24ae169cefacf2aa91cc54139a96ec': Fixes associated with the tzdata 2015a update
| | | | | | | | | * Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-devDaniel Xie2015-10-081-8/+0
| | | | | | | | | |\
| | | | | | | | | | * Fixes associated with the tzdata 2015a updateNeil Fuller2015-10-081-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chile has changed the rules for DST. The test duplicates testApia below it, so it can be removed. Bug: 19212588 (cherry-picked from commit ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad) Change-Id: Ibe7c0dc510813826dca13993b6600d368e03740a (cherry picked from commit a88856485e84ad5cd45a6e16310490d871a679c4) (cherry picked from commit 60da282dd4c518190ff3bb4ff0a001c21d867771)
* | | | | | | | | | | am 3ee1e2ac: am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am ↵Daniel Xie2015-10-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev * commit '3ee1e2acaa4c41cd76ddc04a34a921851c31ccbf': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| * | | | | | | | | | am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am ↵Daniel Xie2015-10-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev * commit 'ab44963a80f58e83c296bb835e131e41e6704d62': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | * | | | | | | | | am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am ↵Daniel Xie2015-10-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev * commit '7999eb24b4c6004eb61a73b1fa3306ffd1ca4154': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | * | | | | | | | am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am ↵Daniel Xie2015-10-080-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev * commit '904fb41d29f56558de1479004b450a09c8c08fd1': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | | * | | | | | | am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix ↵Daniel Xie2015-10-081-36/+15
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev * commit '0e5d0c7623cd9a824e724c5e4d482396f5fd6b48': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | | | * | | | | | am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix ↵Daniel Xie2015-10-081-36/+15
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev * commit '9551a862b9e5536dc69920fd4f0ae45adb3b6f42': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | | | | * | | | | am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix ↵Daniel Xie2015-10-081-36/+15
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev * commit '97a16d1ac217e0eb3fd4ec8fe8abc360aa969c60': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | | | | | * | | | am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS ↵Daniel Xie2015-10-081-36/+15
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failures." into kitkat-cts-dev * commit 'afc1b34aca91144c80dfa7a46f52874fd8df3a31': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | | | | | | * | | am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." ↵Daniel Xie2015-10-081-36/+15
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kitkat-cts-dev * commit '1d1abc5b0ccf31e79aa7173b2e592b7e52b3e519': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | | | | | | | | * | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-10-081-36/+15
| | | | | | | | | |\ \ | | | | | | | | | | |/ | | | | | | | | | |/| | | | | | | | | | | | kitkat-cts-dev
| | | | | | | | | | * Fix TimeZoneTest#testPreHistoricOffsets CTS failures.Elliott Hughes2015-10-081-36/+15
| | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was more complicated than necessary, and now we have better historical data for Asia/Saigon it's started to fail. I've removed that part of the test (because there are now a lot more transitions) and rely solely on Africa/Bissau. We really only need one transition so we can test two times: one before the first transition and one after the last transition. Bug: 18285300 Change-Id: Ic820e88b319095b89779d271f45f5cb1c90173da (cherry picked from commit d05995d8c7488044352343d5125698795032b937)
* | | | | | | | | | am 73e64b14: am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ↵dxie@google.com2015-09-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev * commit '73e64b14f309d46295c2ee411504dcbaceadb777': 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
| * | | | | | | | | am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved ↵dxie@google.com2015-09-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for a18ebd19 to klp-modular-dev * commit 'afe2e6ce54af43d0539bf82f94f918cc2dee767c': 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
| | * | | | | | | | am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for ↵dxie@google.com2015-09-290-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a18ebd19 to klp-modular-dev * commit '6823274059649ba07e28a4ff4fe09bbeb0bca438': 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
| | | * | | | | | | am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to ↵dxie@google.com2015-09-290-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'c43d70e6f6b03d1d25dc8cd8f2ee0bc85284cfa7': 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
| | | | * | | | | | am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-devdxie@google.com2015-09-290-0/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9073d215346226f7ddaefa0dfe805153e84f2865': 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
| | | | | * | | | | am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-devdxie@google.com2015-09-290-0/+0
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba1b44d5f54cb3c61ff4747dc356dfc7be614972': 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
| | | | | | * | | | resolved conflicts for a18ebd19 to klp-modular-devcd /gitc/manifest-rw/klp-modular-dev-gitc-merge repo sync export OUT_DIR=/usr/local/google/gitc/klp-modular-dev-gitc-merge/out # This should take 30 seconds to setup the full klp-modular-dev branch. # To resolve the conflict, next we need to clone the repo project: cd libcore # Create a new, unique branch. Note this will clone the project and may take a while the first time, depending on the size of the repo project. repo start manual_merge_a18ebd19 . git fetch goog a18ebd194ea82c5190f86fe62b56f0e46b1b36cd git merge a18ebd194ea82c5190f86fe62b56f0e46b1b36cd # Fix the conflict (markers are in the file); Build & Test; git add # (files you changed) git commit -m "resolved conflicts for a18ebd19 to klp-modular-dev" repo upload . # get approval, submit2015-09-280-0/+0
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I1cd7c9a1a026e73f4e7ff7cc8ae69fc269866640
| | | | | | | * | | am 66b3ce69: am 70a463cb: Merge "Fix the ENGINE_finish/ENGINE_free mixup The ↵Daniel Xie2015-09-281-4/+5
| | | | | | | |\ \ \ | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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" into kitkat-c * commit '66b3ce6970f1462c81ddd7301914e60b3e8d663a': 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
| | | | | | | | * | am 70a463cb: Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were ↵Daniel Xie2015-09-281-4/+5
| | | | | | | | |\ \ | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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" into kitkat-cts-dev * 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 "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-09-281-4/+5
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | * Fix the ENGINE_finish/ENGINE_free mixupTakeshi Katae2015-09-101-4/+5
| | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I14b3bb9e6f7ce851a83792b5523d72510120dbbe Signed-off-by: Takeshi Katae <takeshi.katae.xm@kyocera.jp>
* | | | | | | | | | am 75090d49: (-s ours) am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am ↵Daniel Xie2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due * commit '75090d49a4f7cd5372e03b92821ba25e59a761df':
| * | | | | | | | | am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am ↵Daniel Xie2015-09-150-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into ki * commit 'ebc4ca8222be974b201fe35e599533f99a0c1915':
| | * | | | | | | | am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am ↵Daniel Xie2015-09-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit 'c5a96cff51ad9948b4fa392fdbbbdce02c9c037e':
| | | * | | | | | | am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am ↵Daniel Xie2015-09-150-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '3a8c0d1e1d3f2d434be47f525d60d83320f8b6c9':
| | | | * | | | | | am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am ↵Daniel Xie2015-09-120-0/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit 'cd8cc93f3558fde16bf25669cb9a57522c8b223a':
| | | | | * | | | | am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am ↵Daniel Xie2015-09-040-0/+0
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit 'd59d0d7a7248246d43a58fe417880867a34631f9':
| | | | | | * | | | am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge ↵Daniel Xie2015-09-040-0/+0
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit 'aad953fae0bfad5c06fcb60bd1b527312f387d1e': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
| | | | | | | * | | am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: ↵Daniel Xie2015-09-040-0/+0
| | | | | | | |\ \ \ | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '92cec14754d8ad8d9018d0dcb3767663492bc8da': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
| | | | | | | | * | am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ↵Daniel Xie2015-09-040-0/+0
| | | | | | | | |\ \ | | | | | | | |/ / / | | | | | | | | | _ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '8a012b3a3ce662370beef99a02a4c353edd66c6b': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
* | | | | | | | | am 13405d75: am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am ↵Daniel Xie2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '13405d7548b81316bb154483b666f0370ff410a1':
| * | | | | | | | am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am ↵Daniel Xie2015-09-150-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '55b43a5c0203cfb5bab43c94be4ad411fa28812d':
| | * | | | | | | am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am ↵Daniel Xie2015-09-150-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '141d6fed07ed5fc07977aba1cd2eda8358058e27':
| | | * | | | | | am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip ↵Daniel Xie2015-09-150-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '9b98f31fa9b7bcd7f46bfbb0d6281705904c6fe9':
generated by cgit v1.1 at 2025-01-08 16:39:26 +0000