tree 87460bb4c9b4c8d6f51fbe8a26de347ed493653b
parent 3d3303a258a9826a679b9c714d15523505e32e1c
parent affe0b5f764274a34b2869de7c529df61c24de7b
author Winson Chung <winsonc@google.com> 1389815685 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389815685 -0800

am affe0b5f: Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermit

* commit 'affe0b5f764274a34b2869de7c529df61c24de7b':
  Tightening migration conditions. (Bug 11973614)