tree 69861f589ad722108236af13a17db7aed63a1c75
parent 7362e0d8fe6bd6739dbd22c2ad4c2c7fb0f7c1d4
parent 74f7dfa8033732a614ad0a755bc2b917032155d0
author Jamie Gennis <jgennis@google.com> 1318622188 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318622188 -0700

Merge "Surface: fix a protected buffer test" into ics-mr0