Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am:...
Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f2 am: 561df62a" into nyc-mr1-dev-plus-aosp
am: 8b979155
* commit '8b979155':
Change-Id: I24c3016b91309db4c3502650e76e3f1a9e4df266