Merge "Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 am: e1b1fb1740" into nyc-mr1-dev-plus-aosp
am: 69decb497f
* commit '69decb497f15e2cf713f73e31578c4edef9924ce':
Change-Id: I317593471c9557e6f713cebb63ab477cda46f226
This commit is contained in: