tree 4a3efb05d1359114488645936af05add97fba79b
parent 53a1bd9f932c16d90fa4ece89c1fcf5a532c1766
parent a131498398940c214b02cc33d95febed4650c95d
author Christopher Tate <ctate@google.com> 1436314567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436314567 +0000

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

* commit 'a131498398940c214b02cc33d95febed4650c95d':
  App linking: permit overlapping link handling