OSDN Git Service

Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d am: 3b7c4...
authorSergio Giro <sgiro@google.com>
Wed, 24 Aug 2016 20:32:04 +0000 (20:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:32:04 +0000 (20:32 +0000)
am: abef050951

Change-Id: I9b75a23af362663f80e66cafb620fe4846060fdd


Trivial merge