tree 86985f3c1006036e54ec07e7e9d902eaf7cf753e
parent 8ff07ad72ce6aeebd1bab6b89f4e4f0fc31407b7
parent ec58564768e4aebb71910ed6066ce523bc14991c
author Alex Klyubin <klyubin@google.com> 1440674882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674882 +0000

am ec585647: (-s ours) am f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev

* commit 'ec58564768e4aebb71910ed6066ce523bc14991c':