tree 54124be793d2663e0443526c7f6fe1e32f4d6123
parent 76263ffc88ecd95c0f260c83a0a65ca417d8ff61
parent 166638b73769fb4f5455b7c1169f9b59136e529d
author Andreas Huber <andih@google.com> 1281558059 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1281558059 -0700

Merge "This code in CameraSource really should hold the lock." into gingerbread