tree ed1e56915cfd87dbc949d72a49ccaf3ee122881b
parent 8e1f918738abf70a4dc86dbb12b386a9deea37f8
author John Reck <jreck@google.com> 1397088004 -0700
committer John Reck <jreck@google.com> 1397088004 -0700

Merge hasFunctors & pushStaging into prepareTree

 Bug: 13902607
 Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68