Merge "Merge "Add a check to adjust thumbnail scaling for full screen shots on...
Merge "Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c am: 7f265404" into nyc-mr1-dev-plus-aosp
am: 71a9b4cb
* commit '71a9b4cb':
Change-Id: I5b0ad5837f4cd1b9bac7bd8368266c11a363ba84