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)
commit9227334834ae7c2e8582dd13cad9b69726f15837
treeb2a24eebcddcc637aafe1458ffc2f3e2c3fa03e8
parent74e39de95095fa3f3356f4b47ead63b34c06e087
parent9e37a2e4198d233c3dbee6a985be8e19b5c0dca7
Merge "Don't add other's child as header or footer" into oc-dev
am: 9e37a2e419

Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c