am 01712948: am 449f006f: am 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"

* commit '017129481b50b41a6ed102c76efe8b12d617a5ea':
  Correcting typo in doc of MEDIA_XXX intents