Merge commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876' into eclair-mr2-plus-aosp * commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876': Make our choice of surface explicit.
Merge commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876' into eclair-mr2-plus-aosp * commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876': Make our choice of surface explicit.