Merge "Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be7 am: 83281ad" into nyc-mr1-dev-plus-aosp
am: 6677623
* commit '6677623ca53f54b57aaefa3c51457ad757409df2':
Change-Id: Iedc481834bf082d5a3e00c9f761c76809373ead3
This commit is contained in: