tree abc0603d60caefeb0b76abb59d45c3d06f262379
parent ad22da0dcbba04b53ae570d89db46ea9eb24234f
parent 44242ee450fc5d709c7c9fa5b9b60cf7f780ee2a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582275111 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582275111 +0000

Merge "Ensure consistent handling of generated headers/dirs" am: a0d58893fc am: 44242ee450

Change-Id: Ia79588237460b26927cfb09379ca9685741f317f