tree 49f02f5b84c4a649201644483d29cac44813d772
parent 3701296a70806627b93d38025952eed0af8e2f18
parent c8417676ed247d879e76e336264a5621bc4374f7
author Andrii Kulian <akulian@google.com> 1472505422 +0000
committer android-build-merger <android-build-merger@google.com> 1472505422 +0000

Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
am: c8417676ed

Change-Id: Id80f837166f392e6490a09cfb22d1b748e19b5f5