tree fafc00168d00ec7d78c9ea630f69a3d34f98b070
parent 6160c3947ae2aa1080a269279d04862eb7108a8a
parent fe2fb82657d52c17c9a09fb74e140b80db634a8c
author Winson Chung <winsonc@google.com> 1392410314 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410314 +0000

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

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