tree d97ae8f4f83df05e144288af754776bf09d4c84e
parent a0931d657551f5098f805fbdeeed2b060bbe6171
parent 6652b3edcb7ef5402c05db12f477ceb23c27d6ec
author Andy McFadden <fadden@android.com> 1347481355 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347481355 -0700

Merge "Watch for SurfaceFlinger death" into jb-mr1-dev