{"shas":[["fd2c650856f570ded469c6275a3bdef36d685f1e","2375fa63e2908bb2df59f606483a3aa92321db7a@doshaska.net","Merge remote branch 'upstream/gingerbread' into gingerbread\n\nConflicts:\n\tsrc/com/android/camera/PreviewFrameLayout.java\n\nChange-Id: I875e9dbd9c26f424a7743bcb5a53ab429ab6a677","nadlabak"],["1d8b7903c038a874b0edd4a5f95f806a00860f7b","dea94a0844b5eabbd4facc1feb96e20a0f3b79ea@googlemail.com","Merge remote-tracking branch 'nadlabak/gingerbread' into gingerbread\n\nConflicts:\n\tsrc/com/android/camera/Camera.java","elektroschmock"]],"ref":"refs/heads/gingerbread","size":2,"head":"1d8b7903c038a874b0edd4a5f95f806a00860f7b","push_id":35683825}