Bug 1062568 - Inline the activity options used in the system app in order to make it easier to automatically extract the activity arguments from the source code; r=timdream
Merge pull request #23687 from ehsan/1062568

Bug 1062568 - Inline the activity options used in the system app in order to make it easier to automatically extract the activity arguments from the source code