[automerger skipped] Merge "Require a more specific intent" into qt-dev am: 4305c5fbf8 am: 663079facf -s ours am: 07fb4f8818 -s ours am: a15824b211 -s ours
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 a9afc32ddc is in history
Change-Id: I63a2cdc6a5b9a069833e871248ebea0d0c67ab56
This commit is contained in: