John Reck 2ec1098961 DO NOT MERGE Remove dead code
Cherry pick

Change-Id: I19603a6e234b0b2592ef90fd426b2973cff8e4fd
2012-08-28 16:29:51 -07:00
..
2012-08-28 16:29:51 -07:00
2012-07-31 12:27:32 -07:00