| commit | 87ececf5c8e4305bdfd4717c5c5584065dffbc97 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Aug 31 12:51:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 12:51:16 2016 +0000 |
| tree | 8052abd28649a4ddbb90c4ccc29777b06291054f | |
| parent | 7790666747b05ab8056e1f5539b1b57dd33e2180 [diff] | |
| parent | e04c029ed53926a8494292301731d64648d4bdee [diff] |
Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b am: e04c029ed5 Change-Id: Ib38154e6828802889d4f4e385e109de925ece1bc