tree df692b18c7892879bff2c3144e03008a859094b2
parent 09ad2d8994ac770f60607dc3b1c848531ce076e9
parent 7509d7725207bfc28f7757c18518e21110c0736d
author Andreas Huber <andih@google.com> 1295459502 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295459502 -0800

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

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