tree dea4f4e6f47e3ddb22dad2a3b9ef799b3e111096
parent 3781f41ddafb5f51d80c7a0c927af478884c926b
parent 80b52b3c7a16ccf0b57f78b09858afaf3f686559
author Garfield Tan <xutan@google.com> 1493251057 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493251057 +0000

Merge "Kill action mode before changing root." into oc-dev