tree 9ac48e591e022bfedaab463c8375511aa34dca49
parent 953f9670acaf4d8cc9d379ed05e0df3423c90b05
parent b3341eef5251e7e16a3257a634106a0464270fd7
author Steven Moreland <smoreland@google.com> 1499385383 +0000
committer android-build-merger <android-build-merger@google.com> 1499385383 +0000

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

Change-Id: I8f2a71ed881d6415a7f1fd22b5dfe384e8c21a10