am 84a507ae: am 13c04c27: Merge "surfaceflinger: Fix range check for getFormat"

* commit '84a507aeea37753090ce8a34845fef5befca7060':
  surfaceflinger: Fix range check for getFormat