am 6f0a36e6: Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev
am 6f0a36e6: Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev

* commit '6f0a36e691fd4c434a80631e4dda212d35745d83':
  Enforce READ_EXTERNAL_STORAGE on emulator.

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