OSDN Git Service

Merge "java.security.spec: add public field in MGF1ParameterSpec" am: 5b24bccbc8...
authorSergio Giro <sgiro@google.com>
Wed, 24 Aug 2016 20:31:59 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:31:59 +0000 (20:31 +0000)
am: 77322b04e6

Change-Id: I61d5981111943430ca34603a67d823b0efab43aa


Trivial merge