tree 4931cb1a01b1032aaf2ce7b4b2c3921e95690902
parent 6d4c17931ef0d80f62f973e662489c2438855946
parent 12857dfc1c4d93b33f0a8c7307dd954e6c83bb9b
author Paul Miller <paulmiller@google.com> 1440677856 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440677856 +0000

am 12857dfc: (-s ours) am 4516f3ed: am 52f5c3b6: Manual cherry-pick of "Remove com.android.chrome.browser authority"

* commit '12857dfc1c4d93b33f0a8c7307dd954e6c83bb9b':