tree 2e0c542bbc27c2b6019e6919f47a140e7e5b1d3f
parent 7fbbbd5ea15aaed1419a4362fc819fb57529cfb9
parent 1a77efe9ba5d111044a734415cb75ffb7cf959e1
author Andrii Kulian <akulian@google.com> 1465504437 +0000
committer android-build-merger <android-build-merger@google.com> 1465504437 +0000

Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev
am: 1a77efe9ba

Change-Id: Idb9aad2fb3161552b699f271bed940cb47fd98ad