tree 9bee37b2bbc11f876f76a8e2398d3ebe2d4e877f
parent da3f525759d4b875fd6a498cbe22f7bc9e53aa83
parent a92eab69d130f9b1b5600e428c53f32662b4a1e1
author Carlos Valdivia <carlosvaldivia@google.com> 1393541032 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393541032 +0000

am a92eab69: am 2cafd66a: am 78ef794d: am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to  launch arbitrary activities.

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