am d5d91948: am c7d515aa: Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev
am d5d91948: am c7d515aa: Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev

* commit 'd5d91948cd4bf6f8352f1ec24b51af7047b9661b':
  media: ImageReader throws OutOfResourcesException when out of buffers

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