OSDN Git Service

Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
authorWinson Chung <winsonc@google.com>
Tue, 25 Jul 2017 15:56:25 +0000 (15:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 15:56:25 +0000 (15:56 +0000)
am: f1f25ad5f2

Change-Id: Idc05690e4201c5b379f41d2f78e951556dd96fc5


Trivial merge