From: Daichi Hirono <hirono@google.com>
Date: Wed, 3 May 2017 02:27:56 +0000 (+0000)
Subject: Merge "Don't add other's child as header or footer" into oc-dev am: 9e37a2e419
X-Git-Tag: android-x86-9.0-r1~4543
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=919d2c1a9824e64cde6b73a9a8ba6a63eefe3a9d;p=android-x86%2Fframeworks-base.git

Merge "Don't add other's child as header or footer" into oc-dev am: 9e37a2e419
am: 9227334834

Change-Id: I07df9ddb7136e7018b0be1d2dfaa1c7f589e0df2
---

919d2c1a9824e64cde6b73a9a8ba6a63eefe3a9d