commit | 2937245af4439e2623202c0f54903cfc36a75392 | [log] [tgz] |
---|---|---|
author | Winson Chung <winsonc@google.com> | Mon May 22 16:32:01 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 22 16:32:01 2017 +0000 |
tree | 2ce241149000f2151175c34e6dc786b430d2f55a | |
parent | e21b3703eb706522ede63ec824d0aae4fc833a1b [diff] | |
parent | 75eab7fa160b56a0ae950711f3461520470f6674 [diff] |
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev am: 305c332c22 am: 75eab7fa16 Change-Id: I48f1fd5730232c6978fedfeb42bb07684d667da4