tree 8e1701a315c38b5af8ddaed7743f52fd32f60aba
parent 47c452125c2441d3e8fe369c80e52d7616169fb7
parent b0726a71b0b6e7e3d4b3c77de76fe575277dfe96
author Vijay Venkatraman <vijaykv@google.com> 1486493490 +0000
committer android-build-merger <android-build-merger@google.com> 1486493490 +0000

Merge "Revert "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK"" am: 95fb9b8c60 am: b791175501
am: b0726a71b0

Change-Id: Ia31a26a99cd4c1aff544805a0f79e60c03e14e7f