tree 3d7cbcc40a2f242247bbc0ab869134090f5177d4
parent 16cf0acf2b096ba62936166ed11a30b15d117de4
parent a9be33b6b51531701adaec2770da50a4363af914
author Steven Moreland <smoreland@google.com> 1499386055 +0000
committer android-build-merger <android-build-merger@google.com> 1499386055 +0000

Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp
am: a9be33b6b5

Change-Id: I421d1a203e2366c7e29080e35ea528f779190c34