tree 87ddbb09d7e1a3efb234579e7205e501044cd972
parent ef89c2b7e81cc03bc7f57ff95b639f40eed0955f
parent 6241951371bb45fb98a60ece3343444741bdbfe9
author Martin Stjernholm <mast@google.com> 1551409436 -0800
committer android-build-merger <android-build-merger@google.com> 1551409436 -0800

Merge "Don't look for libnpt.so in java.library.path." am: bdf22a2da2 am: b791271b74
am: 6241951371

Change-Id: I6ddbc4438bcfa5a4b3b6c3a26664fc4d6e73cc0f