OSDN Git Service

Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
authorShawn Willden <swillden@google.com>
Wed, 18 Feb 2015 05:50:06 +0000 (05:50 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 18 Feb 2015 05:50:07 +0000 (05:50 +0000)
1  2 
include/hardware/keymaster_defs.h

Simple merge