tree 78c1262c54f81c5b6d294fc0e9bcb68c2ad7b4f9
parent 9b59509c6a94f1943ce64d3b5e9b4de2aa846d4d
parent 2a8de804a2a8313fc4571a73c625d8213237b825
author Dianne Hackborn <hackbod@android.com> 1357590016 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357590016 -0800

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

* commit '2a8de804a2a8313fc4571a73c625d8213237b825':
  Correcting typo in doc of MEDIA_XXX intents