OSDN Git Service

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


Trivial merge