tree 09b340015b19f87e6f92c738415874f35697f5d5
parent d0da0b8aae97d9aadd70fa7b7094d305b5da7305
parent 017129481b50b41a6ed102c76efe8b12d617a5ea
author Dianne Hackborn <hackbod@android.com> 1357590451 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357590451 -0800

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