| commit | e04c029ed53926a8494292301731d64648d4bdee | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Aug 31 12:42:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 12:42:32 2016 +0000 |
| tree | 71459d13e48a30a456abcad795fdeb7c0cfabbef | |
| parent | 0ac5c5085097a0c7673a59c08a29d15377b8ee54 [diff] | |
| parent | 565c1fbf8b45326a6e42a15cdf745e3735a4e752 [diff] |
Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b Change-Id: Iec116355209c0770b4125142f93873766e29d61d