Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017
am: 0fbe648878
am: a7a2a28247
am: 781ac2d738
am: 593f621976
Change-Id: I33109ce015441cbbd8620fc136b64f939efbe98a
This commit is contained in: