tree 3d7cbcc40a2f242247bbc0ab869134090f5177d4
parent afeacbc69c1527e858eb8220c1851f8f579288fc
parent 1aecbdb63404411fcdc8dfa5fc261283e088e786
author Android Build Merger (Role) <android-build-merger@google.com> 1499386167 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499386167 +0000

Merge "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: e62a5014b5"