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