OSDN Git Service

Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY." am: f704e8a939
authorShawn Willden <swillden@google.com>
Thu, 28 Jan 2016 23:28:10 +0000 (23:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jan 2016 23:28:10 +0000 (23:28 +0000)
am: b9733d9bff

* commit 'b9733d9bff225ae0b16feeb64283b123225af465':
  Add KM_TAG_ALLOW_WHILE_ON_BODY.

1  2 
include/hardware/keymaster_defs.h

Simple merge