tree 2857d01e73ad0a72857f589aa8ad2baee2117154
parent c50e04a50c9598ac9ecc684b39fa3dc286a00caf
parent 66278049acd8a6c3ca2b1373a039e8f0cdd824ec
author Dan Albert <danalbert@google.com> 1477002695 +0000
committer android-build-merger <android-build-merger@google.com> 1477002695 +0000

Merge "Add license to ndk_headers." am: cf39459d1f am: 0f3445be83
am: 66278049ac

Change-Id: Ic15803ea2f8314f3b1bedd889a7c98f9d3bca21a