tree 5118c5f98940d303617a83247b6d5d606b5624cb
parent 6573607b5223bc03261cc1fadf2831a716446d73
parent 340e34512a5777312c7fb23061a5dc82bcb93366
author Martijn Coenen <maco@google.com> 1440099127 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440099127 +0000

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

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