tree df730b6beccc8d7367c8319f0f185217f959d665
parent b1a423e760b7c3384149e374643a881ff344501b
parent b23ad33d58a326142dd4e6fa22b2284774fb866b
author Winson Chung <winsonc@google.com> 1500998629 +0000
committer android-build-merger <android-build-merger@google.com> 1500998629 +0000

Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev am: f1f25ad5f2
am: b23ad33d58

Change-Id: I0662079c2183a094d5352504172c000ef483d658