From: Christopher Ferris <cferris@google.com>
Date: Thu, 22 Jun 2017 21:26:08 +0000 (+0000)
Subject: Merge "Merge "Add a common call when wrapping an app." am: 12e0975963 am: bb6cf84a40... 
X-Git-Tag: android-x86-9.0-r1~2339^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=adea31fc1a1def7ad692bb8b8804bb289ab78779;p=android-x86%2Fframeworks-base.git

Merge "Merge "Add a common call when wrapping an app." am: 12e0975963 am: bb6cf84a40 am: 1d10ce12ff" into oc-dr1-dev-plus-aosp
am: 68a974ef44

Change-Id: I6f20da639b79e63fbafd71c7a365054493e86e45
---

adea31fc1a1def7ad692bb8b8804bb289ab78779