tree 55a8a8690fbe3de3497e95c7773b0422541ec470
parent 12286b2608f69c3911c40f4dc2a070097373b73f
parent 5c091dc9449b583e18656a8850a61f557dfcc945
author Steven Moreland <smoreland@google.com> 1500519526 +0000
committer android-build-merger <android-build-merger@google.com> 1500519526 +0000

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958
am: 5c091dc944

Change-Id: I582cc33d13d04950ca066074c292141605f3ca27