OSDN Git Service

Merge changes I85f430fb,I514a136b
authorShawn Willden <swillden@google.com>
Thu, 29 Jan 2015 00:45:57 +0000 (00:45 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 29 Jan 2015 00:45:57 +0000 (00:45 +0000)
commit1e541c22d3552b116f0ab3e3a826f458b2821673
tree83f863acc22c42158a44b5a9724e2cfa5c1fa567
parent1309477bdaaecc35b468f00045d9b1d005dde377
parent611a695c2442ca35e55d4a4cf82ca53879a0a344
Merge changes I85f430fb,I514a136b

* changes:
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.