| commit | 7283fb18022674daee4dcdc3a218190791f8cd0e | [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 | 68bbd8da7ea525fc53695a1ed6f1b234fbafa1ff | |
| parent | 8c690ea9976d644db3c96eddbbbd2d50eac56913 [diff] | |
| parent | 7b7225c8fdbead25235c74811b30ff4ee690dc58 [diff] |
Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge Conflicts: camera/libcameraservice/CameraService.cpp