tree ef8ad1a7a8f8cf4a82d0fc4b74f7349ad621dc35
parent e952487497bef612fdfbe1405cc7dee2f8dd18bd
author Jeff Sharkey <jsharkey@google.com> 1493839508 +0000
committer gitbuildkicker <android-build@google.com> 1493864861 -0700

Revert "Don't add other's child as header or footer"

This reverts commit 358d0d329785a225449aa9c8aea7fcc2c7bec741.

This CL resulted in b/37933333 regression, so it'll have to re-land with a target API check.

Change-Id: I1c2e4de43a15c1851d98f6aff432585ada80fb5b
(cherry picked from commit 48fef8ce495dc140b8cda1d198de766f76709381)