commit | fb823c7f6e34973fbfbee788b2ed658dc4544742 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Thu Jan 29 01:00:58 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:00:58 2015 +0000 |
tree | 04fbf6f4c6d422881de7c489dadce9a126379a9f | |
parent | 9e9fa066345fd3c17a995f447f07495a0f1eeb13 [diff] | |
parent | 1e541c22d3552b116f0ab3e3a826f458b2821673 [diff] |
am 1e541c22: Merge changes I85f430fb,I514a136b * commit '1e541c22d3552b116f0ab3e3a826f458b2821673': Remove extraneous 'const' on rescope. Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.