Merge "Allow pinned activities to finish immediately" into nyc-dev am: 64ca270600
am: 820fec2283
* commit '820fec22831e1fc7ac6055c3ebcb641b1dffa349':
Change-Id: I8ad521203b299d0e8ea3b25b0ccbdc9b36733e40
This commit is contained in: