From: Bryce Lee <brycelee@google.com>
Date: Thu, 31 Aug 2017 14:54:15 +0000 (+0000)
Subject: Merge "Clear pending activity options when retrieved in ActivityManagerService."... 
X-Git-Tag: android-x86-9.0-r1~392^2~3^2~68
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af63ced796a91123f9730897c58669783c7c4477;p=android-x86%2Fframeworks-base.git

Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev
am: 7e0e6e904c

Change-Id: I4d8c8ee58d8d1618ea39342dca0434e6a286fc1b
---

af63ced796a91123f9730897c58669783c7c4477