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)
commitef01d9796740b44d098ea1de355cb62af4f52cb5
tree48c34d508afcc27c7022e893d382be9e1ee5eb4e
parente3a89161a2bf5519ef178ed34263b46bad34b3a7
parentb9733d9bff225ae0b16feeb64283b123225af465
Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY." am: f704e8a939
am: b9733d9bff

* commit 'b9733d9bff225ae0b16feeb64283b123225af465':
  Add KM_TAG_ALLOW_WHILE_ON_BODY.
include/hardware/keymaster_defs.h