tree 29c8f606b8efd847fefc5fce9cd1fe605163b8b4
parent bd686a1e1d3cb8662661cbabcab09b224abf97a2
parent 9dbaaab85eb4557b40086e6b37882af7b03725ba
author Vinit Deshapnde <vinitd@google.com> 1384397293 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384397293 -0800

am 9dbaaab8: am daf21d76: am 75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev

* commit '9dbaaab85eb4557b40086e6b37882af7b03725ba':
  Increase Reject threshold for disabling networks