OSDN Git Service

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

Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c


Trivial merge