tree 9191640744df1e75b4dab54d36db7a83eb223790
parent cd21970e01fff9a9f96e1ec0bb13d540c128105f
parent 8f559c1cbd52fe5b9c5175aa654ad15873012714
author Steven Moreland <smoreland@google.com> 1500428799 +0000
committer android-build-merger <android-build-merger@google.com> 1500428799 +0000

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

Change-Id: Icadd0e098c8c8c52772cf86506d96f1535c2a7e9