Merge "Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92 am: 7f26540426" into nyc-mr1-dev-plus-aosp
am: 71a9b4cb59
* commit '71a9b4cb5967754340a4a81ab54f9725c1e48839':
Change-Id: I5b0ad5837f4cd1b9bac7bd8368266c11a363ba84
This commit is contained in: