tree 798458fafdd7884682906a48ce575787fe086169
parent f03c090f3e41a80282e4febd85ca53c681649f86
parent e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc
author Chris Tate <ctate@android.com> 1440548450 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440548450 +0000

am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev

* commit 'e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc':
  Teach Pm about the "always ask" link-handling state