| commit | c006456f515928cb5a6ac6bdce85736b506e4f89 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Thu May 04 01:16:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 04 01:16:29 2017 +0000 |
| tree | 219420a74e1a5a514eb0818c2b8f54d736c07b83 | |
| parent | 2c6d5cd7eff1ec7c0efc47489aa4d610955037f7 [diff] | |
| parent | a3ff1b35c5ce526183d15f141f3cc8fb578f2c48 [diff] |
Merge "Revert "Don't add other's child as header or footer"" into oc-dev am: 6e0332f308 am: a3ff1b35c5 Change-Id: I0376d88061f48ce95cdb4b26e5228989d760dafa