summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-19 09:51:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-19 09:51:42 -0800
commitd3bf3eeadd59748b9cbe7535378b4bdf8dd8f117 (patch)
tree240a05aeb71c0201291a3d46b210518db7bbdd7e /include
parent42ac32498aea67a43f666946c4b77a376f54cfaf (diff)
parent2597aedb3869e46f945359c529e03263c77a944d (diff)
downloadframeworks_base-d3bf3eeadd59748b9cbe7535378b4bdf8dd8f117.zip
frameworks_base-d3bf3eeadd59748b9cbe7535378b4bdf8dd8f117.tar.gz
frameworks_base-d3bf3eeadd59748b9cbe7535378b4bdf8dd8f117.tar.bz2
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.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions