OSDN Git Service

Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
authorWinson Chung <winsonc@google.com>
Mon, 22 May 2017 16:20:18 +0000 (16:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 16:20:18 +0000 (16:20 +0000)
commit75eab7fa160b56a0ae950711f3461520470f6674
tree1768f207d9bdd76ea7189ff503f11696acd7a3a0
parentb8bcdf50e4b52f00c1c74afca776d483fe3fb6da
parent305c332c2219878f009aefad4471d87f08359981
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
am: 305c332c22

Change-Id: I9fc712b5b5d96398177883b1979a3ea5744efa89