tree dbdcf7fa771dbdb8cbffe499a906fe8bb3f88110
parent 510169a46ed556de3f602da790a433afdef002ff
parent 494979faf9bdf7a0850b0b9ea70aa747bc2c201e
author Dan Albert <danalbert@google.com> 1477002709 +0000
committer android-build-merger <android-build-merger@google.com> 1477002709 +0000

Merge "Add licenses to ndk_headers." am: 8c9cd8a215 am: 1bef51ae50
am: 494979faf9

Change-Id: I8df2571df3b2a7fd065ce3c1d98febebba76bfe2