commit | a97323a1fbab2e94f0c4a51c092a37bc1668dfd4 | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Wed Aug 11 13:28:51 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 11 13:28:51 2010 -0700 |
tree | ec2afb48cfbf0958ca5fbc29f6a00b72b9a9ad68 | |
parent | 9ff1dfae5478025e482f23f72e1ca972f7f778e8 [diff] | |
parent | 58f81d841b3418c0629f3f5523c32b85e122fdd8 [diff] |
am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp * commit '90d1d104272954042d5440f248980e4348e97686': This code in CameraSource really should hold the lock.