tree a16be2882f443623c70e89bb8774e685fc4b0340
parent 58522e0458ffb46c33227a37d2c3cf0094f0c2df
parent ad8690266ecd91a5d63a9dc289e7308abd86e37d
author Jeff Sharkey <jsharkey@android.com> 1504304543 +0000
committer android-build-merger <android-build-merger@google.com> 1504304543 +0000

Merge "Don't over-acquire NPMS locks." into oc-mr1-dev am: 4576171c33
am: ad8690266e

Change-Id: I4a975059ceb64dd6ce143645c00a314a2041ad2c