tree ad9a5c3cea777381537a73b098c6a6408e699c3d
parent 0d43ba8c91b4e6cc678cb5cd762f7a38c4406a51
parent cace67f7ddf467e649604a8b08aa582ce5c33532
author Winson Chung <winsonc@google.com> 1392410313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410313 +0000

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

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