tree 1768f207d9bdd76ea7189ff503f11696acd7a3a0
parent b8bcdf50e4b52f00c1c74afca776d483fe3fb6da
parent 305c332c2219878f009aefad4471d87f08359981
author Winson Chung <winsonc@google.com> 1495470018 +0000
committer android-build-merger <android-build-merger@google.com> 1495470018 +0000

Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
am: 305c332c22

Change-Id: I9fc712b5b5d96398177883b1979a3ea5744efa89