tree 1f64a76087644e4ebf9a2f9c111261fd99781bb9
parent c6f6dad32a867f8b06fb2b1b502304c547864823
parent 2789708444707f9fb34e102b79d808d354c84784
author Dan Albert <danalbert@google.com> 1477002730 +0000
committer android-build-merger <android-build-merger@google.com> 1477002730 +0000

Merge "Add license to ndk_headers." am: c741dd4838 am: e69242a71b
am: 2789708444

Change-Id: I17b067f1a150e21c3151a85cd57ea1acae538c03