Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev am: 33f39a96cb
am: e1e991dd93
* commit 'e1e991dd93f07378d8f22e9810f88930d1946beb':
Change-Id: Iddbcda93dd6557f037c142eb3959f0ed30097ad2
This commit is contained in: