Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am:...
Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3a am: 769c456b" into nyc-mr1-dev-plus-aosp
am: 81956e5f
* commit '81956e5f':
Change-Id: I1e8d210ea86862dbc11ca0f2ac97723d59c1928e