tree bc3ab60417a21a6b7a4b181f8fe7b6993d328fcf
parent 9272db024d013fbb48ec476c77562ab31d75a461
parent 8b91693683895a8b148f6ffea8944cef2ba8d99b
author Paul Lawrence <paullawrence@google.com> 1393531208 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393531208 -0800

am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

* commit '8b91693683895a8b148f6ffea8944cef2ba8d99b':
  Prevent authenticators from using Settings to  launch arbitrary activities.