tree a94e9c07d35f40e9a9f22d60b1329153bff3159a
parent 2cafd66a57894687867e7ba6623389e0ccc38ade
parent 1dd01130cd0a3a43fac14da3a998ae0ac282cf80
author Paul Lawrence <paullawrence@google.com> 1393540470 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393540470 +0000

am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: 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 activitie

* commit '1dd01130cd0a3a43fac14da3a998ae0ac282cf80':
  Prevent authenticators from using Settings to  launch arbitrary activities.