tree 9191640744df1e75b4dab54d36db7a83eb223790
parent 1715b9cfd880f4cbcc137f1753c28f041a8a4e1d
parent ca197a2c10cc467e692496283002e4589b7992cd
author Steven Moreland <smoreland@google.com> 1500429098 +0000
committer android-build-merger <android-build-merger@google.com> 1500429098 +0000

Merge "Move default libnativehelper include to mock dir." am: cfdbad8210 am: 0b6891cc21 am: 8f559c1cbd
am: ca197a2c10

Change-Id: I72d1cd7801b7076c055e49678a48a267d9fe15d4