Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6 am: 769c456bc1" into nyc-mr1-dev-plus-aosp
am: 81956e5fc6
* commit '81956e5fc60be9cb842d233a607fab1c570a9124':
Change-Id: I1e8d210ea86862dbc11ca0f2ac97723d59c1928e
This commit is contained in: