OSDN Git Service

Merge "Don't over-acquire NPMS locks." into oc-mr1-dev
authorJeff Sharkey <jsharkey@android.com>
Fri, 1 Sep 2017 22:03:47 +0000 (22:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Sep 2017 22:03:47 +0000 (22:03 +0000)
am: 4576171c33

Change-Id: I2d23f8b238b8386958c0fd7348542713abb355dd


Trivial merge