tree 41090401fb4d53703d60dc77114207f3057da888
parent e7e472662a924b7f23b1be19594b9daf601ff43e
parent ffba2dfd7a5a6e60ce45453bde9fc8eb6f2fe4c8
author Winson Chung <winsonc@google.com> 1392411268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411268 +0000

am ffba2dfd: am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf

* commit 'ffba2dfd7a5a6e60ce45453bde9fc8eb6f2fe4c8':
  Revert "Fixing crash in empty folders. (Bug 11627191)"