OSDN Git Service

Merge "Fix Keymaster HAL crash." into oc-dev am: a22bc7450b
authorShawn Willden <swillden@google.com>
Wed, 3 May 2017 22:03:17 +0000 (22:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 22:03:17 +0000 (22:03 +0000)
am: 839ef0db40

Change-Id: Iff8c31d686680a33674a4f5a480c3bf90c8bd4be


Trivial merge