tree 97c1c8e82c4123d17b17c9a8c7e98ff27145a64c
parent 1960c88baffd5371b69bbe5268702dd02b8a24a3
parent 290638a8f6c639d232395a19328f06244361e27d
author Greg Kaiser <gkaiser@google.com> 1574269253 -0800
committer android-build-merger <android-build-merger@google.com> 1574269253 -0800

Merge "Revert "DecryptHandle cleanup"" am: 43251208e3
am: 290638a8f6

Change-Id: I7cef4abe0dac124795566cb8f556990aef5a60c8