Fixed bad merge in ViewRoot.java.
Fixed bad merge in ViewRoot.java.

Change-Id: If76a320da3ecf0d0e9f366eb7157b195274a9e5f

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base