tree 678ddaf9629bcb4cc673cb7f7cf6e87e3688680f
parent 98efab2d28a08f56c4ab04a3bce14a21cd13ad44
parent e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc
author Chris Tate <ctate@android.com> 1440548403 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440548403 +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