tree 9f4cb9a278baee4509055c867ab086940647ec3d
parent e04c029ed53926a8494292301731d64648d4bdee
parent 8a5790a287a0ec8d12c65ce59accfa1bf70f3327
author Sergio Giro <sgiro@google.com> 1472652249 +0000
committer android-build-merger <android-build-merger@google.com> 1472652249 +0000

Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc
am: 8a5790a287

Change-Id: Icebe2f83f4532c5ad57fe385d365c93732d97145