tree 21357b3a777ad0ab5eb9f2c9628157897b44602b
parent da41ea669890a79a4d2bc57dab9ae03157fd9e75
parent 6de1ba3377dd407e83f682edf9ae742416302772
author Winson Chung <winsonc@google.com> 1386638154 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386638154 -0800

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

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