tree 6a21b36899330f086860058401adf713a770c9c8
parent 9865760d3df2ff5000a6c00a36ea3fb8da778242
parent 57db1511bdc8f1317997edc1850650f60055ad0c
author Steven Moreland <smoreland@google.com> 1500478776 +0000
committer android-build-merger <android-build-merger@google.com> 1500478776 +0000

Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208cd1322 am: 106c355688
am: 57db1511bd

Change-Id: If1de13ecd84a5bf43edefd844e1b46104bddf9a0