From: Dan Sandler <dsandler@android.com>
Date: Thu, 18 Oct 2018 14:11:29 +0000 (-0700)
Subject: [automerger skipped] resolve merge conflicts of aad998c0b4b97190754e72548960cf72b967d... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d9a25e38f7d036251dfd597e148044db8f31e3e;p=android-x86%2Fframeworks-base.git

[automerger skipped] resolve merge conflicts of aad998c0b4b97190754e72548960cf72b967dc0f to pi-dev-plus-aosp
am: 134e4b284b  -s ours

Change-Id: Ib01f7765aed17d06fd8aa09fee071b0cefa1128f
---

7d9a25e38f7d036251dfd597e148044db8f31e3e