tree effe56cc150985df1c6fc7e619cbccaa08c0b055
parent 18bf9906978a50042eebd638a14d4fc8f7596431
parent 340e34512a5777312c7fb23061a5dc82bcb93366
author Martijn Coenen <maco@google.com> 1440074560 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440074560 +0000

am 340e3451: Merge "Handle notification type value 1 in RF_DISCOVER_NTF"

* commit '340e34512a5777312c7fb23061a5dc82bcb93366':
  Handle notification type value 1 in RF_DISCOVER_NTF