am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1

* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
  If an error occurs that prevents us from reallocating buffers during a format change
tree: 12a598f6c9508bd248943bec6bf227bca25c4a3f
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/