OSDN Git Service

Merge "Don't add other's child as header or footer" into oc-dev am: 9e37a2e419
authorDaichi Hirono <hirono@google.com>
Wed, 3 May 2017 02:27:56 +0000 (02:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 02:27:56 +0000 (02:27 +0000)
am: 9227334834

Change-Id: I07df9ddb7136e7018b0be1d2dfaa1c7f589e0df2


Trivial merge