OSDN Git Service

am 1e541c22: Merge changes I85f430fb,I514a136b
authorShawn Willden <swillden@google.com>
Thu, 29 Jan 2015 01:00:58 +0000 (01:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 01:00:58 +0000 (01:00 +0000)
* commit '1e541c22d3552b116f0ab3e3a826f458b2821673':
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.


Trivial merge