OSDN Git Service

Merge "Revert "Don't add other's child as header or footer"" into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Thu, 4 May 2017 01:11:36 +0000 (01:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 May 2017 01:11:36 +0000 (01:11 +0000)
commita3ff1b35c5ce526183d15f141f3cc8fb578f2c48
treed6bd9a57a1a8e832b013ec7378989f02901dd407
parent43284ad8b76b61f37256a99861f46aa85907ea75
parent6e0332f3080463691ef71282a10b5d2f863030b8
Merge "Revert "Don't add other's child as header or footer"" into oc-dev
am: 6e0332f308

Change-Id: I088c65f866de6a9df51784865531b0cc44ea4248