[automerger skipped] DO NOT MERGE Set ContainerLayer for buffer-less surface
am: ff674ee468 -s ours
Change-Id: Ic161409d5b07942a05595f45c0b511ac5d14e5db
This commit is contained in:
am: ff674ee468 -s ours
Change-Id: Ic161409d5b07942a05595f45c0b511ac5d14e5db