tree 3622f9eecbfce57c372eff97d32d5bce1568bebd
parent 277af4eeb62a96a28121c6461f5ed2d5e16f6cf5
parent 80780da923f52a6b5a80f8619cf3e735970eaad9
author Wei Wang <weiwa@google.com> 1401489591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401489591 +0000

am 80780da9: Add protection for controller timeout/failure, maximum number of advertisers, filters etc.

* commit '80780da923f52a6b5a80f8619cf3e735970eaad9':
  Add protection for controller timeout/failure, maximum number of advertisers, filters etc.