tree 71ccbe16e8e4127dcf017f4459b40ec2535cbb69
parent 2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87
parent 6160c3947ae2aa1080a269279d04862eb7108a8a
author Winson Chung <winsonc@google.com> 1392411268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411268 +0000

am 6160c394: am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf

* commit '6160c3947ae2aa1080a269279d04862eb7108a8a':
  Fixing crash in empty folders. (Bug 11627191)