tree 5a6a54a812ea1e1574604c02b73afb5373fdb538
parent 1694e3ba82f1d6850aa1aba2423b0e8642d6b0eb
parent 9ea329ed1255af74f16722074023b04cfb9b938e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580252881 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580252881 +0000

Merge "Stop using LOCAL_COPY_HEADERS" am: f526767014 am: db4bd17858 am: 9ea329ed12

Change-Id: I121f7aa15028164dbe94773f362f1f40b3e34b3b