tree 52b587a9ae0f9b37f504470d1ecb36953317fb11
parent 01c80693939dc5449911203968fccf2f30c1db83
parent 7b2bcd04109674553ab4e8a462ea26fafe5304c1
author Jorim Jaggi <jjaggi@google.com> 1492018488 +0000
committer android-build-merger <android-build-merger@google.com> 1492018488 +0000

Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev am: fe99773a70
am: 7b2bcd0410

Change-Id: I9deaf6b8740be2b162a452b3a06183edcb56fd7b