The ATLAS detector at the Large Hadron Collider is used to search for high-mass resonances decaying to an electron-positron pair or a muon-antimuon pair. The search is sensitive to heavy neutral Z' gauge bosons, Randall-Sundrum gravitons, Z* bosons, techni-mesons, Kaluza-Klein Z/gamma bosons, and bosons predicted by Torsion models. Results are presented based on an analysis of pp collisions at a center-of-mass energy of 7 TeV corresponding to an integrated luminosity of 4.9/fb in the dielectron channel and 5.0/fb in the dimuon channel. A Z' boson with Standard Model-like couplings is excluded at 95 percent confidence level for masses below 2.22 TeV. A Randall-Sundrum graviton with coupling k/Mbar = 0.1 is excluded at 95 percent confidence level for masses below 2.16 TeV. Limits on the other models are also presented, including Technicolor and Minimal Z' Models.