tree 84396f89aaa316bec9dc5247bad7834b55222acb
parent 0fb734060951ad2513680f2d9f9013ff68c2772e
parent a18eec546fdd7b48cee7a4fce5ba0f2ca6ad7889
author Jean-Baptiste Queru <jbq@google.com> 1359409921 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359409921 -0800

am a18eec54: Merge "Fix regression in LEAP"

# By Jouni Malinen
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit 'a18eec546fdd7b48cee7a4fce5ba0f2ca6ad7889':
  Fix regression in LEAP