commit | 1dc1938c477249c0c1adc59043da64386eea4c2d | [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 | ff4e6d511759318b7f8af71cecb712469d1805dc | |
parent | 9c5945d0fdd6783d8bd393e4444140e76eced518 [diff] | |
parent | 4d074e81e8a8b3b057d31adcb64a088acad6d15c [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.