tree 8b0159f2d12919d715ef1c34488a1e0e9c0a1dc9
parent 2760274df32e935bc148dc63c0f0abdd2dc8ce47
parent 72960975d8367e7ce789d8a5b6f0763fb0ec78bf
author Adam Cohen <adamcohen@google.com> 1389902359 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389902359 -0800

am 72960975: Migration update: ensuring all folders go first

* commit '72960975d8367e7ce789d8a5b6f0763fb0ec78bf':
  Migration update: ensuring all folders go first