commit | 565c1fbf8b45326a6e42a15cdf745e3735a4e752 | [log] [tgz] |
---|---|---|
author | Sergio Giro <sgiro@google.com> | Wed Aug 31 12:31:33 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 12:31:33 2016 +0000 |
tree | bf8dc2739ff29ffd812f6f6c569f806524591da9 | |
parent | 47f7d8384b316d43df72ac2fa9fff5f15624c092 [diff] | |
parent | d53ae2c2850f79d2721243781a0e527786157fe0 [diff] |
Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 Change-Id: I22c2ac6b7afcd590864a7a27cd68cc13c8b9da7d