OSDN Git Service

Merge "Fix Keymaster HAL crash." into oc-dev
authorShawn Willden <swillden@google.com>
Wed, 3 May 2017 21:59:29 +0000 (21:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 21:59:29 +0000 (21:59 +0000)
commit839ef0db4058c4d8dd37ece22069fcb181453a7e
tree5022baa193646860832446af306b0579d51254a6
parent62ce08c3a276529ae37f5dead1f81321d85f3b38
parenta22bc7450b8a114843a27c36c511910bf4472914
Merge "Fix Keymaster HAL crash." into oc-dev
am: a22bc7450b

Change-Id: I7c765d18c3a6fc8e9741e45802f2991b07cf6fdf