[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: f395b23fa5 -s ours am: 3c5db25f37 -s ours am: 5eab8b117d -s ours
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f466 is in history
Change-Id: Ieb6707a337ff6399fe51f9c5b7d5ebe0dd09c95b
This commit is contained in: