tree 6ccef914c629c2d341e3173e2ac3f88c41c5cb07
parent e690f565fd1926885f2b12c2aee2dddc5ba99983
parent 904fb9d79cc72879e4c6767c219ec78feda8e62b
author Wink Saville <wink@google.com> 1316714020 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316714020 -0700

am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom

* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.