From: Jeff Gaston <jeffrygaston@google.com>
Date: Wed, 4 Apr 2018 22:58:05 +0000 (-0700)
Subject: Merge "Update for sdk drop" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d52a9561ebe28a879c44048d5bf2a01957a661f9;p=android-x86%2Fframeworks-base.git

Merge "Update for sdk drop" into pi-dev
am: 71436c639a

Change-Id: I4485b4e775ff34ed383428f9f96de114c36c824f
---

d52a9561ebe28a879c44048d5bf2a01957a661f9