tree 485b152b97bf8321fdd223f35587bb4294672be8
parent afcfa2f23ac63b354d52bde3c02da3ec3782106b
parent 988637e559cb76d53568b93571e41c728f2f1b1d
author Jamie Gennis <jgennis@google.com> 1323727804 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323727804 -0800

Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1