tree 0065956e3c33fce43b9b0b519866ac93485af5fc
parent 4d9b2e941ce18d94005f100712266ad2009eeb5f
parent 0c1c942de3b742aa02a83cb4cffd464d5a953825
author Dan Albert <danalbert@google.com> 1477002227 +0000
committer android-build-merger <android-build-merger@google.com> 1477002227 +0000

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

Change-Id: I13c02ef01ad09918f72446e23b9f6128d4007a50