tree fd7e686e543831f92fa6fe37702da562fd428e99
parent 7f0767e4ba5e88cb74c48dd0dfa99fdc57b19ce3
parent 99cc97527169291953175288aa904a0215279c2a
author Adam Cohen <adamcohen@google.com> 1389902498 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389902498 -0800

am 99cc9752: am 72960975: Migration update: ensuring all folders go first

* commit '99cc97527169291953175288aa904a0215279c2a':
  Migration update: ensuring all folders go first