tree 09fc2fa3b6245677241eca7e7c39b3a663da11b6
parent 0a7a4107acb5e4b62e4582b6ee8bf90cc636378d
parent 42e511d6c7be0762b887baa921123ece253e7815
author Christopher Tate <ctate@google.com> 1436319568 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436319568 +0000

am 42e511d6: am a1314983: am 7f25ad62: am 15bb16fb: Merge "App linking: permit overlapping link handling" into mnc-dev

* commit '42e511d6c7be0762b887baa921123ece253e7815':
  App linking: permit overlapping link handling