tree a6252e7d8036dea948f719cbe5408cd48f884870
parent 1dd2e88ed442dcf99e6c91ee52e626f2bf31c400
parent 36865896072ee78cae1e987f29340d35a1526f44
author Alex Klyubin <klyubin@google.com> 1427854855 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427854855 +0000

am 36865896: am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"

* commit '36865896072ee78cae1e987f29340d35a1526f44':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH