tree 942da1e399eb46694c8bb0fd13092bd16a4a5058
parent b2149f4a11cddba303674298ef543e76ea11475e
author Conley Owens <cco3@android.com> 1304013994 -0700
committer Conley Owens <cco3@android.com> 1304013994 -0700

Fixed bad merge in ViewRoot.java.

Change-Id: If76a320da3ecf0d0e9f366eb7157b195274a9e5f