OSDN Git Service

Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d
authorSergio Giro <sgiro@google.com>
Wed, 24 Aug 2016 20:21:30 +0000 (20:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:21:30 +0000 (20:21 +0000)
commitabef050951471be2b31157d8394bfe15d46f4fb9
treefec1f2549abb0d78340b474e85754e2ba6ce5499
parent8d9a8759af84c897e486ad859fbfce0d1fd0e70e
parent3b7c46af6ff8bd1b67750cd36b82171af250a43d
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d
am: 3b7c46af6f

Change-Id: I83f4e28e8f51cec728461e6db3c7d4ee8370b7fd