OSDN Git Service

am 87150001: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into...
authorShawn Willden <swillden@google.com>
Wed, 18 Feb 2015 11:38:57 +0000 (11:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Feb 2015 11:38:57 +0000 (11:38 +0000)
commit6433684417c7cf889b29cc4480488111aaac618a
tree4af9f6c934393c28f447e5ba244e058b32fe1e8f
parentade0dc3c5d9778d08a96e9939428ab73248f84d6
parent871500013a60c052475b219be3da10a8b6a9e66b
am 87150001: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-dev-plus-aosp

* commit '871500013a60c052475b219be3da10a8b6a9e66b':
  Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA