am 5640e6a9: am 44fc8d5e: Merge "Add media directory, hidden for now." into jb-dev
am 5640e6a9: am 44fc8d5e: Merge "Add media directory, hidden for now." into jb-dev

* commit '5640e6a93757adafb5316037bec7ad378b73f1bf':
  Add media directory, hidden for now.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base