tree 7df839482bab2c1d7158edb2aa2a4c334ab23ae1
parent 5b2c66e4da749ca59d09776ec7831e20d1211909
parent 67f0739ca3a81515975856b09d216debfd090ae9
author Jeff Sharkey <jsharkey@google.com> 1438991517 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438991517 +0000

am 67f0739c: Merge "Block moving when already in progress." into mnc-dev

* commit '67f0739ca3a81515975856b09d216debfd090ae9':
  Block moving when already in progress.