am 82f5115d: Merge "Change MediaSet.reload." into gingerbread

Merge commit '82f5115d4e61b71f2e8a3b1edc1fa3f3d100ff42' into gingerbread-plus-aosp

* commit '82f5115d4e61b71f2e8a3b1edc1fa3f3d100ff42':
  Change MediaSet.reload.