{"shas":[["f5dc328af340774753d94602613520fbc9db11b2","2375fa63e2908bb2df59f606483a3aa92321db7a@doshaska.net","Merge remote branch 'upstream/gingerbread' into gingerbread\n\nConflicts:\n\tsrc/com/cyanogenmod/cmparts/activities/InputActivity.java\n\nChange-Id: Ib4e853f77f143eb5098a9ff725d98a8285aee5cf","nadlabak"],["690465951dfb8f1060a8f4aa2a7388a8b975e6a1","dea94a0844b5eabbd4facc1feb96e20a0f3b79ea@googlemail.com","Merge remote-tracking branch 'upstream/gingerbread' into gingerbread","elektroschmock"]],"ref":"refs/heads/gingerbread","size":2,"head":"690465951dfb8f1060a8f4aa2a7388a8b975e6a1","push_id":34958322}