| commit | 196c5b82df03ac7436196a568f160aa6031d4597 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Sep 01 01:18:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 01 01:18:18 2016 +0000 |
| tree | 8c45b0158ea7058f1240305e8a531f38bed92ef0 | |
| parent | 26275abbbd0f0140dc28494406290a765112ff16 [diff] | |
| parent | 87ececf5c8e4305bdfd4717c5c5584065dffbc97 [diff] |
Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b am: e04c029ed5 am: 87ececf5c8 Change-Id: I970ea89c8e278b675ef63645224e456d932b614b