OSDN Git Service

Merge "Clear pending activity options when retrieved in ActivityManagerService."...
authorBryce Lee <brycelee@google.com>
Thu, 31 Aug 2017 14:54:15 +0000 (14:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 14:54:15 +0000 (14:54 +0000)
am: 7e0e6e904c

Change-Id: I4d8c8ee58d8d1618ea39342dca0434e6a286fc1b


Trivial merge