tree 7b7fa0cd78ec3f23433819ec988474c3ce4ddf84
parent ff4b0fdb43fb101cd3a60865cb66a94a26974e01
parent 95f8f0ed6508c29180900e6c813e146caa200600
author Winson Chung <winsonc@google.com> 1490641733 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490641737 +0000

Merge "Prevent cleaning up and resuming null activity when task is reparented."