| commit | 7118052e318a672f9633ed54aa826d564ff93bee | [log] [tgz] |
|---|---|---|
| author | Dave Sparks <davidsparks@android.com> | Thu May 21 10:17:23 2009 -0700 |
| committer | Dave Sparks <davidsparks@android.com> | Thu May 21 10:17:23 2009 -0700 |
| tree | 93b2b344788e9b6fbbaf543c79bed59c6b90b873 | |
| parent | 1c4b60c2f25189681474b6adf0286c69247e0f21 [diff] | |
| parent | fec880df27adeb901a0e936e7bf3f944d8b95cb7 [diff] |
Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge Conflicts: camera/libcameraservice/CameraService.cpp