tree 1be4999cb2d8d70a46264e7c65bd92abc6b493cc
parent e11ca6d80b5939f48f1bd782863ede6ad764f731
parent 27daeba300231c7e23da540f44cb92397e1167ba
author Wale Ogunwale <ogunwale@google.com> 1496183600 +0000
committer android-build-merger <android-build-merger@google.com> 1496183600 +0000

Merge "Set correct task remove mode when reparenting" into oc-dev am: 7b64dbd529
am: 27daeba300

Change-Id: I5ebc2cff38a38f2916414576332d757553c5de60