tree 41090401fb4d53703d60dc77114207f3057da888
parent 6bce875df144ec95318eaaebb40a63863a5caf83
parent a0a8305a53ff52ad0222b113d084a86bd2bd6a12
author Winson Chung <winsonc@google.com> 1392411746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411746 +0000

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

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