tree e380d787a12678fc779908d97cbd9c4691ac4723
parent cace67f7ddf467e649604a8b08aa582ce5c33532
parent d65fb393595cb093936c7d5d0d54b0511430aa9d
author Winson Chung <winsonc@google.com> 1386638342 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386638342 -0800

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

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