From: Chad Brubaker <cbrubaker@google.com>
Date: Tue, 13 Jun 2017 21:29:45 +0000 (+0000)
Subject: Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
X-Git-Tag: android-x86-9.0-r1~1029^2^2~374
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bfd7cc4dbb;p=android-x86%2Fframeworks-base.git

Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am: 4a0ea3e88f

Change-Id: Id7b7326f819c9e0389c3ad9db2863e72ec716f83
---

bfd7cc4dbb4615b45321475e4bd14edc8e2b55b5