tree cba62d0d64153aa2169651696bc238591341d679
parent 33cddd186afe9134f241295a960ac5384166ae3e
parent e7e472662a924b7f23b1be19594b9daf601ff43e
author Winson Chung <winsonc@google.com> 1414085532 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085532 +0000

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

* commit 'e7e472662a924b7f23b1be19594b9daf601ff43e':