tree 5166a88c39046a83a188eb431f5caa80a5f82461
parent 7d019020fdab380866cd1e1ad429a959baeb3c39
author John Reck <jreck@google.com> 1300902991 -0700
committer John Reck <jreck@google.com> 1306428035 -0700

DO NOT MERGE Fix history crash on 7in

 Bug: 4490754
 This is a cherry pick from master of CL Ia1f397e0

Change-Id: I6c4aa3128648ed4a3ef44b6c9197863721ed0dc6