summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore ↵Daniel Xie2015-09-120-0/+0
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in KeyStoreTest" into kitkat-cts-dev * commit '2ab5a4898ae61056b8eee8231f0761245dd93295':
| | | | | * | | | am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in ↵Daniel Xie2015-09-040-0/+0
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyStoreTest" into kitkat-cts-dev * commit '45101b8ebb8d2261c1733d305f5e165971ef7dc1':
| | | | | | * | | am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into ↵Daniel Xie2015-09-042-1/+8
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev * commit '9f275caac3c90dac2d91c2faf94f4179c9d90fb7': Skip TimaKeyStore in KeyStoreTest
| | | | | | | * | am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-devDaniel Xie2015-09-042-1/+8
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '977acac83f5c25a1d0ea4aed38af5f05672ce7c5': Skip TimaKeyStore in KeyStoreTest
* | | | | | | | \ \ am 07238756: am 507bf148: am 3731a3c5: am 05b8a1b9: am 5181c773: am ↵Neil Fuller2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '0723875605a82af0c973bb583e2526e1e61a7621':
| * | | | | | | | | am 507bf148: am 3731a3c5: am 05b8a1b9: am 5181c773: am 4fe837f0: am ↵Neil Fuller2015-09-150-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '507bf14855b99fc39a2a527faeeee8cac5bbf2d7':
| | * | | | | | | | am 3731a3c5: am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am ↵Neil Fuller2015-09-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '3731a3c573e38d5a55b5ac5009bda77f6698061f':
| | | * | | | | | | am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add ↵Neil Fuller2015-09-150-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '05b8a1b98dc6b85029776506eb07fe8c27c626c1':
| | | | * | | | | | am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add ↵Neil Fuller2015-09-120-0/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '5181c7732c3e5db6bff9505470ae4a7db9fc6718':
| | | | | * | | | | am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() ↵Neil Fuller2015-09-040-0/+0
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '4fe837f0ea8682a7e4fd8802b88c9721de517192':
| | | | | | * | | | am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move ↵Neil Fuller2015-09-041-12/+33
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit 'd5ae4a3c49703cb7678ccccc4e98ed6c4b1f5b73': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | | | | | | * | | am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet ↵Neil Fuller2015-09-041-12/+33
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification out of testLoopback()." into kitkat-cts-dev * commit '19679b0fde4e1a7321101b558e2f4961daec923e': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
* | | | | | | | \ \ \ am a08a66a7: am 96d0e10e: am dc98ff65: am 8970261f: am c09272ef: am ↵Bill Yi2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit 'a08a66a7f8789954daf05dabc296a46771237bc0':
| * | | | | | | | | | am 96d0e10e: am dc98ff65: am 8970261f: am c09272ef: am 4f2c91b1: am ↵Bill Yi2015-09-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '96d0e10e8a639b8baf0d82fdb1409c3ff9207348':
| | * | | | | | | | | am dc98ff65: am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am ↵Bill Yi2015-09-150-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit 'dc98ff659c3939f16e00841258746a5346d1f654':
| | | * | | | | | | | am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix ↵Bill Yi2015-09-150-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '8970261ff2e76fc8ff707ca2e799a66f738624e0':
| | | | * | | | | | | am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race ↵Bill Yi2015-09-120-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit 'c09272efaaefc243123f18e0bb39ae6d3194dfb7':
| | | | | * | | | | | am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in ↵Bill Yi2015-09-040-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '4f2c91b1160d4b3d5ff7631c4752aaccd028d0ad':
| | | | | | * | | | | am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." ↵Bill Yi2015-09-040-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit 'bd08c8d83dec8af1ed502522b3c5a125fd693581': Fix race condition in WeakHashMapTest.
| | | | | | | * | | | am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev ↵Bill Yi2015-09-040-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '6da6b0e4a410cb3bbbbcf56cba742ba881ca1b47': Fix race condition in WeakHashMapTest.
* | | | | | | | | | | | Avoid using point-to-point interfaces in multicast socket testsNeil Fuller2015-09-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multicast on a point-to-point interface isn't really multicast. Bug: 23279677 (cherry-picked from commit 67d7597da46910e65a089bcce0afa8e0c2bed668) Change-Id: Ib102e9d04744d3e99b8828ac31d9548e72b703dd
* | | | | | | | | | | | am d8e4189c: am 2c3be718: am 61d1c8f6: am f86ad679: am 2d459b82: am ↵Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 660504ac: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev * commit 'd8e4189cd7b515489e8465892e2fde8798b68b25':
| * | | | | | | | | | | am 2c3be718: am 61d1c8f6: am f86ad679: am 2d459b82: am 660504ac: Merge ↵Neil Fuller2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fixes and improvements for SerializationTest" into lollipop-cts-dev * commit '2c3be718b9c8a5479883f40613a69c424244dbec':
| | * | | | | | | | | | am 61d1c8f6: am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and ↵Neil Fuller2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improvements for SerializationTest" into lollipop-cts-dev * commit '61d1c8f603f33a788add550bdf46711f356ac506':
| | | * | | | | | | | | am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvements for ↵Neil Fuller2015-09-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev * commit 'f86ad679780b7464c522bf48c8b7281a306862bd':
| | | | * | | | | | | | am 2d459b82: am 660504ac: Merge "Fixes and improvements for ↵Neil Fuller2015-09-011-37/+67
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev * commit '2d459b820732ffcc775dcb70051e3d0b7f9c7d43': Fixes and improvements for SerializationTest
| | | | | * | | | | | | am 660504ac: Merge "Fixes and improvements for SerializationTest" into ↵Neil Fuller2015-09-011-37/+67
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev * commit '660504acb29860588107fdf175768e9b036fd3ff': Fixes and improvements for SerializationTest
* | | | | | \ \ \ \ \ \ \ am fc3762eb: am 2cb494ee: am c510037b: am ecdd89b8: am b472314a: am ↵Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev * commit 'fc3762eb5fca80ace6ce9a6db34e81c5bba7f305':
| * | | | | | | | | | | | am 2cb494ee: am c510037b: am ecdd89b8: am b472314a: am 34d183b4: Merge ↵Neil Fuller2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev * commit '2cb494ee8b7c162162fc390080bc8078380fe7da':
| | * | | | | | | | | | | am c510037b: am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes ↵Neil Fuller2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev * commit 'c510037b2835ad36a559f7af672f3036ed40c750':
| | | * | | | | | | | | | am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes associated ↵Neil Fuller2015-09-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with an OkHttp bad proxy response fix"" into lollipop-cts-dev * commit 'ecdd89b848b716110df99b556a7cea58b17d4ee7':
| | | | * | | | | | | | | am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp ↵Neil Fuller2015-09-011-8/+18
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bad proxy response fix"" into lollipop-cts-dev * commit 'b472314acb543ad31bdaad26c58b64f25f393038': Revert "Changes associated with an OkHttp bad proxy response fix"
| | | | | * | | | | | | | am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy ↵Neil Fuller2015-09-011-8/+18
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | response fix"" into lollipop-cts-dev * commit '34d183b404333627266d568e905a60e2be3a06f3': Revert "Changes associated with an OkHttp bad proxy response fix"
* | | | | | \ \ \ \ \ \ \ \ am 4434066e: am ccd58650: am 3078014c: am 2b4d636e: am 25720de0: am ↵Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23fe202d: Merge "Fixes associated with the tzdata 2015a update" into lollipop-cts-dev * commit '4434066e2fc8595efb2308c5cbe6f6e8b96083aa':
| * | | | | | | | | | | | | am ccd58650: am 3078014c: am 2b4d636e: am 25720de0: am 23fe202d: Merge ↵Daniel Xie2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fixes associated with the tzdata 2015a update" into lollipop-cts-dev * commit 'ccd58650491a99f1d83c806d5593358cd4cd97a8':
| | * | | | | | | | | | | | am 3078014c: am 2b4d636e: am 25720de0: am 23fe202d: Merge "Fixes associated ↵Daniel Xie2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the tzdata 2015a update" into lollipop-cts-dev * commit '3078014cc01797ada5189e05f559bf05d371b980':
| | | * | | | | | | | | | | am 2b4d636e: am 25720de0: am 23fe202d: Merge "Fixes associated with the ↵Daniel Xie2015-09-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tzdata 2015a update" into lollipop-cts-dev * commit '2b4d636ee34b64923361e7c0ad3a50ed37f8126d':
| | | | * | | | | | | | | | am 25720de0: am 23fe202d: Merge "Fixes associated with the tzdata 2015a ↵Daniel Xie2015-09-011-8/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lollipop-cts-dev * commit '25720de04b90708826a62944428578eb809f51f1': Fixes associated with the tzdata 2015a update
| | | | | * | | | | | | | | am 23fe202d: Merge "Fixes associated with the tzdata 2015a update" into ↵Daniel Xie2015-09-011-8/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev * commit '23fe202d2e3c85b7245648360211aa22547ea355': Fixes associated with the tzdata 2015a update
* | | | | | \ \ \ \ \ \ \ \ \ am d9ba9afc: (-s ours) am 27c6acaf: (-s ours) am f6fecb58: (-s ours) am ↵Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df000639: (-s ours) am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit 'd9ba9afced350e7ee4816e6129b259d05c3ce5e3':
| * | | | | | | | | | | | | | am 27c6acaf: (-s ours) am f6fecb58: (-s ours) am df000639: (-s ours) am ↵Daniel Xie2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit '27c6acaf1c189e0c90ae15e84d35dcb41a5674f0':
| | * | | | | | | | | | | | | am f6fecb58: (-s ours) am df000639: (-s ours) am 2b6c3536: (-s ours) am ↵Daniel Xie2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit 'f6fecb583f797f94d17b735083b7778a51267f56':
| | | * | | | | | | | | | | | am df000639: (-s ours) am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge ↵Daniel Xie2015-09-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit 'df00063926ecc88f439506cc05594bb392e02a58':
| | | | * | | | | | | | | | | am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: ↵Daniel Xie2015-09-010-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit '2b6c35362abafa59dd5bde1e33f6c2b77803d31e': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
| | | | | * | | | | | | | | | am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ↵Daniel Xie2015-09-010-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit '91994f09dce81de7b307aa88ce3c1c56cb0c7683': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
* | | | | | \ \ \ \ \ \ \ \ \ \ am e6440690: am 0a0b1797: am 4822b351: am 24a20484: am edef8836: am ↵Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac * commit 'e64406909d5ba24f9f346eaa7760ea030f2d84c4':
| * | | | | | | | | | | | | | | am 0a0b1797: am 4822b351: am 24a20484: am edef8836: am c25d8adf: Merge "Skip ↵Daniel Xie2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac * commit '0a0b179746fc0de0e6a32b77f66006044caf672b':
| | * | | | | | | | | | | | | | am 4822b351: am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore ↵Daniel Xie2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in KeyStoreTest" into kitkat-cts-dev automerge: 977acac * commit '4822b351636758cab5df191f001a0c79971a6343':
| | | * | | | | | | | | | | | | am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in ↵Daniel Xie2015-09-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyStoreTest" into kitkat-cts-dev automerge: 977acac * commit '24a2048498e80cbc8602f56169d9f6875ddb9488':
| | | | * | | | | | | | | | | | am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into ↵Daniel Xie2015-09-010-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev automerge: 977acac * commit 'edef8836113a0fd3f9b72be99ed997eebf7809ba': Skip TimaKeyStore in KeyStoreTest
generated by cgit v1.1 at 2025-01-24 02:13:36 +0000