tree 0065956e3c33fce43b9b0b519866ac93485af5fc
parent 67137204f2cf10a60d9ea5bc021bed016fe1ec65
parent 32015a3c4923dac0dc59c4ce17a1b0944809c128
author Dan Albert <danalbert@google.com> 1477002684 +0000
committer android-build-merger <android-build-merger@google.com> 1477002684 +0000

Merge "Add license to ndk_headers." am: 2dd8f16e44 am: 0c1c942de3
am: 32015a3c49

Change-Id: Iea8c312ba03a7143645684f34052560ce7fa0124