From: Android Build Merger (Role) <noreply-android-build-merger@google.com>
Date: Tue, 3 Apr 2018 01:59:52 +0000 (+0000)
Subject: Merge changes from topic "am-8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec5fab7006;p=android-x86%2Fframeworks-base.git

Merge changes from topic "am-8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp

* changes:
  Merge changes from topic "planz" into pi-dev am: 93e11759d6
  Obtain NPMS through helper method. am: a435ab5124
---

ec5fab7006f9861ee4c70bd3a5a161039b23eb2f