tree 5ab5d4b134266a7af374622518162b6d972ea3a6
parent a458ff06ed68e48bd6ab2b6e0b106bb83e478208
parent 8a21f4aaf9e7eece4f6b8016b4c69c243adac4a3
author Chong Zhang <chz@google.com> 1523334762 -0700
committer android-build-merger <android-build-merger@google.com> 1523334762 -0700

Merge "Update clear key plugin appData to void*" into pi-dev
am: 8a21f4aaf9

Change-Id: Ifebfea86a70d1f23e4b285cc29df1c30bd5c5936