tree a48381ca4870fb636c5de4bbb15a27438bb85c1f
parent 5ef1ae23cbb15f279fb591b7d20affcab55e17a3
parent 8edff26b027f2435f78aa77bca30a258e0ee9d43
author Steven Moreland <smoreland@google.com> 1500477226 +0000
committer android-build-merger <android-build-merger@google.com> 1500477226 +0000

Merge "hardware/qcom/keymaster: use proper nativehelper headers" am: 3587a1a811
am: 8edff26b02

Change-Id: I8a02d1f9f2429f684cec1f5a94195514891acf85