tree 5d945a0c08e27aa9c39a9e15026ac6413e148d69
parent 3e985e9b101a40001748609f5720906b1e6e93c4
parent 611a99da843843a972f03eabef0883a2c5ec2336
author Martin Stjernholm <mast@google.com> 1550250675 -0800
committer android-build-merger <android-build-merger@google.com> 1550250675 -0800

Merge "Add libnpt back into system."
am: 611a99da84

Change-Id: If347ab98059c53a090cbed7cbc6e717cf1268057