tree ac6f62957595f7a70edcbea326f5aa614fd9138e
parent c1fcccc92622927c1fe158c80dfaa5d6af4d4371
parent aa46ce8ac441981ecbf9e72fb4acc6677615efc9
author Andreas Huber <andih@google.com> 1295459610 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295459610 -0800

am d3bf3eea: am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

* commit 'd3bf3eeadd59748b9cbe7535378b4bdf8dd8f117':
  Turn another assertion into a runtime error. Damn you surfaces.