270285 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Bill Yi
142b734458 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: bdc26bab6e  -s ours

Change-Id: I395316ebe79ee829b3538c7167be18a517f782c8
2016-09-07 12:14:15 +00:00
Bill Yi
2a66c5bd84 Import translations. DO NOT MERGE
am: 7c4d3912f3  -s ours

Change-Id: Iba0ae68b665da9e415db251702fd6478f5a7427a
2016-09-07 12:14:13 +00:00
Bill Yi
8fa7d214ae Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 29ccfe7066  -s ours

Change-Id: Ic87bbd0ad342f02b9b89f7460f95785479182cce
2016-09-07 12:13:43 +00:00
Bill Yi
5f97046f24 Import translations. DO NOT MERGE
am: 057353bbf7  -s ours

Change-Id: I968f2c50e110a8fed1636e4a52bf978daa41be6e
2016-09-07 12:13:39 +00:00
TreeHugger Robot
90cfa629cf Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-07 12:07:46 +00:00
Sergio Giro
6767fd28b1 Merge "java.security.PKCS12Attribute: port class from jdk8u60" 2016-09-07 12:07:13 +00:00
TreeHugger Robot
29ccfe7066 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-07 12:07:06 +00:00
TreeHugger Robot
57e29b4b9e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-07 12:06:17 +00:00
TreeHugger Robot
c906d9dc72 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-07 12:05:53 +00:00
Sergio Giro
4c2df18a4d Merge "java.security.SecureRandom: add getInstanceStrong() method" 2016-09-07 12:05:35 +00:00
Sergio Giro
59c0fcf0c8 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" 2016-09-07 12:04:21 +00:00
TreeHugger Robot
bdc26bab6e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-07 12:00:30 +00:00
Yohann Roussel
61f65393b2 Merge "Add a test app for suppressed exceptions" am: 15c6078f4d am: 166ab31073
am: fceccd226b

Change-Id: Ibdef03d5f21190900a49bf404d4645a8a1f2a1b6
2016-09-07 10:12:46 +00:00
Yohann Roussel
fceccd226b Merge "Add a test app for suppressed exceptions" am: 15c6078f4d
am: 166ab31073

Change-Id: Icff43af8769359b3cc97653182831466a02b0c8f
2016-09-07 10:08:16 +00:00
Yohann Roussel
166ab31073 Merge "Add a test app for suppressed exceptions"
am: 15c6078f4d

Change-Id: I45692cdf5081fe848935075d861fad11e68d19ba
2016-09-07 10:03:08 +00:00
Bill Yi
7c4d3912f3 Import translations. DO NOT MERGE
Change-Id: I7ee34b9c13e6c4d8919c5eae201954561a8e6cba
Auto-generated-cl: translation import
2016-09-07 02:53:53 -07:00
Yohann Roussel
15c6078f4d Merge "Add a test app for suppressed exceptions" 2016-09-07 09:52:50 +00:00
Bill Yi
4fd35e0578 Import translations. DO NOT MERGE
Change-Id: I2541b36722c5142046760d243c27929c46c4ec42
Auto-generated-cl: translation import
2016-09-07 00:01:44 -07:00
Bill Yi
ac7ee28cd0 Import translations. DO NOT MERGE
Change-Id: I911f2d59dcaefe83da01e18160b9ab905a9a96b0
Auto-generated-cl: translation import
2016-09-06 23:53:36 -07:00
Bill Yi
9125f16353 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2c0df72ff6 -s ours
am: e566e3ec43  -s ours

Change-Id: I209ec6b46cf1d1e9133b05096e1b73cf38efef8e
2016-09-07 05:00:01 +00:00
Bill Yi
36286e0519 Import translations. DO NOT MERGE am: dd0e168ca5 -s ours
am: 70643782e2  -s ours

Change-Id: I8413a0dbbb02b0e45f004f762dc5a75d60acf4f5
2016-09-07 04:59:53 +00:00
Bill Yi
e566e3ec43 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 2c0df72ff6  -s ours

Change-Id: Id1c20a489505992dff768f5d29399262f047ca3a
2016-09-07 04:54:59 +00:00
Bill Yi
70643782e2 Import translations. DO NOT MERGE
am: dd0e168ca5  -s ours

Change-Id: I18ed5d0b8b6c1169a3c552fb817334b227c7732d
2016-09-07 04:54:58 +00:00