284293 Commits

Author SHA1 Message Date
Sergio Giro
51c1b3466a Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba am: 6c753ca336 am: c0f7d4c65b
am: ff14a693b9

Change-Id: I240cbc0a38f4b90a93678a2a41428228936b733e
2016-09-07 12:44:28 +00:00
Sergio Giro
e76fc7ca5a Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1 am: 52e0434748 am: 724155a3be
am: f0efc8fc28

Change-Id: I04dcfe65ce91145c1cf8c2a13124235916a2d38d
2016-09-07 12:44:22 +00:00
Sergio Giro
cd7448e197 Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d am: 09a2121d5d am: fcc05f0f66
am: e043ec7917

Change-Id: Ia31a59deed24fd7de2c10bf99b467eb1d3433c9d
2016-09-07 12:41:13 +00:00
Bill Yi
f391157087 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e -s ours am: 902770c469 -s ours" into nyc-mr1-dev-plus-aosp
am: f246677e10  -s ours

Change-Id: I3925ed158ec515393827ac69a6c8c56bf7aaab42
2016-09-07 12:41:00 +00:00
Bill Yi
afc92b8c56 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e -s ours am: 902770c469 -s ours
am: 3728f8520b  -s ours

Change-Id: I43306b0adfd10a80a34147b7dfa5d84ff56fa946
2016-09-07 12:40:50 +00:00
Bill Yi
2758d1096f Merge "Import translations. DO NOT MERGE am: 4fd35e0578 -s ours am: f46f825edd -s ours" into nyc-mr1-dev-plus-aosp
am: 2ba460946c  -s ours

Change-Id: I09fca97d0bb4b6c6041dedc6ef4a3a47833592f4
2016-09-07 12:40:26 +00:00
Bill Yi
12ad9e37c9 Import translations. DO NOT MERGE am: 4fd35e0578 -s ours am: f46f825edd -s ours
am: d57985ed32  -s ours

Change-Id: Ibcd90359d418676d7ce698d8c0c061e092b07197
2016-09-07 12:40:18 +00:00
Bill Yi
834ee1cd32 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c906d9dc72 -s ours am: b77af8caca -s ours" into nyc-mr1-dev-plus-aosp
am: 14f6892d4b  -s ours

Change-Id: I1754d387cbb7bc916ba08e542efb8a81b0a4492c
2016-09-07 12:34:48 +00:00
Bill Yi
a7d1d4a826 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c906d9dc72 -s ours am: b77af8caca -s ours
am: 0e71f1195b  -s ours

Change-Id: If93b30d2f287ca617741a739b1c86cae065cc3bc
2016-09-07 12:34:43 +00:00
Bill Yi
2fe0f01200 Merge "Import translations. DO NOT MERGE am: ac7ee28cd0 -s ours am: 052dce27c9 -s ours" into nyc-mr1-dev-plus-aosp
am: de32354f40  -s ours

Change-Id: Id1cb22cfa225d976c56c5b7279594cdc481dfd12
2016-09-07 12:34:32 +00:00
Bill Yi
6ae85bbcd4 Import translations. DO NOT MERGE am: ac7ee28cd0 -s ours am: 052dce27c9 -s ours
am: 7e4d95e7a9  -s ours

Change-Id: Ibd03b54d2117988d0e8bf6ed839835f9240fffae
2016-09-07 12:34:28 +00:00
Bill Yi
c0cbf1bfa2 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bdc26bab6e -s ours am: 142b734458 -s ours" into nyc-mr1-dev-plus-aosp
am: 26c00050d1  -s ours

Change-Id: I375a03d3d4a9c6253af615c1af5972aba294d6d5
2016-09-07 12:34:19 +00:00
Bill Yi
b3c8f2d2f3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bdc26bab6e -s ours am: 142b734458 -s ours
am: ca265b8910  -s ours

Change-Id: I11de8d38b696b9f1f15e2e792bb2efc371d92f75
2016-09-07 12:34:15 +00:00
Sergio Giro
c691e60b84 Merge "Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0 am: 9fb957c4e5" into nyc-mr1-dev-plus-aosp
am: c3804b1327

Change-Id: Ic29765ed51ddb6e3b74dba89d198c082326e9c13
2016-09-07 12:34:06 +00:00
Sergio Giro
ff14a693b9 Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba am: 6c753ca336
am: c0f7d4c65b

Change-Id: I02abf258533fe1b5f86d60f24d0bb2810cc5efc7
2016-09-07 12:34:04 +00:00
Sergio Giro
e706e55d94 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0 am: 9fb957c4e5
am: ebebc24c21

Change-Id: I7ca9c7b21310f4056f49bf31d06aa8a23c070574
2016-09-07 12:33:59 +00:00
Sergio Giro
f0efc8fc28 Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1 am: 52e0434748
am: 724155a3be

Change-Id: I1ba1e83b0610166f7ae89cd460ec7435853ccd4e
2016-09-07 12:33:57 +00:00
Sergio Giro
e043ec7917 Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d am: 09a2121d5d
am: fcc05f0f66

Change-Id: I1b68d4f89349567a78935c4e50b2387db8acc9b0
2016-09-07 12:33:51 +00:00
Bill Yi
77083deb70 Import translations. DO NOT MERGE am: 7c4d3912f3 -s ours am: 2a66c5bd84 -s ours
am: fb653868d4  -s ours

Change-Id: I3492281aee98f71f9bd94b7b5ceb951fa8baff59
2016-09-07 12:33:32 +00:00
Android Build Merger (Role)
f246677e10 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e -s ours am: 902770c469 -s ours" into nyc-mr1-dev-plus-aosp 2016-09-07 12:31:05 +00:00
Bill Yi
3728f8520b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e -s ours
am: 902770c469  -s ours

Change-Id: Ie8aa40878420d1675a91da84f46cfd623044fb0b
2016-09-07 12:30:26 +00:00
Android Build Merger (Role)
2ba460946c Merge "Import translations. DO NOT MERGE am: 4fd35e0578 -s ours am: f46f825edd -s ours" into nyc-mr1-dev-plus-aosp 2016-09-07 12:29:29 +00:00
Android Build Merger (Role)
14f6892d4b Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c906d9dc72 -s ours am: b77af8caca -s ours" into nyc-mr1-dev-plus-aosp 2016-09-07 12:29:18 +00:00
Android Build Merger (Role)
de32354f40 Merge "Import translations. DO NOT MERGE am: ac7ee28cd0 -s ours am: 052dce27c9 -s ours" into nyc-mr1-dev-plus-aosp 2016-09-07 12:28:59 +00:00
Android Build Merger (Role)
26c00050d1 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bdc26bab6e -s ours am: 142b734458 -s ours" into nyc-mr1-dev-plus-aosp 2016-09-07 12:28:31 +00:00
Android Build Merger (Role)
c3804b1327 Merge "Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0 am: 9fb957c4e5" into nyc-mr1-dev-plus-aosp 2016-09-07 12:28:18 +00:00
Sergio Giro
c0f7d4c65b Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba
am: 6c753ca336

Change-Id: I3f6c8546ff116fbfcf11c0c0f5b168f56503e22f
2016-09-07 12:28:09 +00:00
Sergio Giro
724155a3be Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1
am: 52e0434748

Change-Id: I4e631cb3d354b2bba2dd0ced239edf60588d12a3
2016-09-07 12:28:00 +00:00
Sergio Giro
fcc05f0f66 Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d
am: 09a2121d5d

Change-Id: I8e2002564fbdc2aea638538bb8954e44d882900e
2016-09-07 12:27:54 +00:00
Sergio Giro
ebebc24c21 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0
am: 9fb957c4e5

Change-Id: Ia497ce4aec873aa9a74099f0dadbf9fe81424205
2016-09-07 12:27:51 +00:00
Bill Yi
d57985ed32 Import translations. DO NOT MERGE am: 4fd35e0578 -s ours
am: f46f825edd  -s ours

Change-Id: Id38db8cc05b29eb499ee66798a359470a67c7d92
2016-09-07 12:27:16 +00:00
Bill Yi
0e71f1195b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c906d9dc72 -s ours
am: b77af8caca  -s ours

Change-Id: Ic877cdaafc996cebb2b1919ed8d1d266714a7f65
2016-09-07 12:27:11 +00:00
Bill Yi
7e4d95e7a9 Import translations. DO NOT MERGE am: ac7ee28cd0 -s ours
am: 052dce27c9  -s ours

Change-Id: I69c864a30b81b4ed4d06a7dc8b649d1b65cdee35
2016-09-07 12:27:07 +00:00
Bill Yi
ca265b8910 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bdc26bab6e -s ours
am: 142b734458  -s ours

Change-Id: I4bf7445c7aa305954115b7ef2ab493113861d7aa
2016-09-07 12:27:03 +00:00
Bill Yi
fb653868d4 Import translations. DO NOT MERGE am: 7c4d3912f3 -s ours
am: 2a66c5bd84  -s ours

Change-Id: I201e92711adc46ac6dd88f1d871b06979addc59b
2016-09-07 12:26:58 +00:00
Bill Yi
a78875e1f4 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 90cfa629cf -s ours
am: ddad1247bd  -s ours

Change-Id: I23d51c85d11c02e485fb3613d66595f603a41c07
2016-09-07 12:26:54 +00:00
Bill Yi
338cbb66cf Import translations. DO NOT MERGE am: cf35085cfd -s ours
am: ffd768ee8e  -s ours

Change-Id: Idd4a0b2eb0b073f079d7a63066e02ea1e2138e41
2016-09-07 12:26:49 +00:00
Sergio Giro
9fb957c4e5 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8
am: 290f2bb2a0

Change-Id: I0030e50dc05e88979d50e73feeb778c79ece47fc
2016-09-07 12:23:41 +00:00
Sergio Giro
6c753ca336 Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
am: 12d3d4bbba

Change-Id: I27e64111dc18e052884b3b571f93a17c9d5f663c
2016-09-07 12:21:36 +00:00
Sergio Giro
52e0434748 Merge "java.security.PKCS12Attribute: port class from jdk8u60"
am: 6767fd28b1

Change-Id: Ib80d6ae24734def58881a4536b232870fb885015
2016-09-07 12:21:17 +00:00
Sergio Giro
09a2121d5d Merge "java.security.SecureRandom: add getInstanceStrong() method"
am: 4c2df18a4d

Change-Id: I5faf9c49a7d09e8eef38edd6cf32de4f65783e5d
2016-09-07 12:20:49 +00:00
Bill Yi
93ef3e33c9 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 29ccfe7066 -s ours
am: 8fa7d214ae  -s ours

Change-Id: I6408a34de6a384054e0bb078db9290a4c8d971fe
2016-09-07 12:20:16 +00:00
Bill Yi
212c3d46d9 Import translations. DO NOT MERGE am: 057353bbf7 -s ours
am: 5f97046f24  -s ours

Change-Id: I9c1e43ee1258cd911889b0031824d11e035aeb18
2016-09-07 12:20:11 +00:00
Bill Yi
ddad1247bd Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 90cfa629cf  -s ours

Change-Id: I8d71e07e06e8ae7b4cd5914786c2d61577f14e52
2016-09-07 12:19:25 +00:00
Bill Yi
ffd768ee8e Import translations. DO NOT MERGE
am: cf35085cfd  -s ours

Change-Id: I9ecdf85922fd8102cfd03589b0ee3656eb5bc708
2016-09-07 12:19:22 +00:00
Sergio Giro
290f2bb2a0 Merge "java.security: port DomainLoadStoreParameter from jdk8u60"
am: 59c0fcf0c8

Change-Id: I8fd7dc636a579c67c4b9851f4babae30e19a2024
2016-09-07 12:14:47 +00:00
Bill Yi
902770c469 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 57e29b4b9e  -s ours

Change-Id: I43d7f780c942eaca845903d578624b43fba70a44
2016-09-07 12:14:28 +00:00
Bill Yi
f46f825edd Import translations. DO NOT MERGE
am: 4fd35e0578  -s ours

Change-Id: Ic02d9837575237d253b2dd9693f8b7c27f1238ac
2016-09-07 12:14:25 +00:00
Bill Yi
b77af8caca Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c906d9dc72  -s ours

Change-Id: I428f022461de19aa0e3190884387deb819938e0b
2016-09-07 12:14:22 +00:00
Bill Yi
052dce27c9 Import translations. DO NOT MERGE
am: ac7ee28cd0  -s ours

Change-Id: I81c59605726c68259d1a49e39a29040ce40e2f64
2016-09-07 12:14:20 +00:00