tree 10da860fcff71886af91d082e31f0e1917926848
parent cebb580f2a77d478f6bea679509e777ee278f64e
parent 564cfbdef48fccb6e26b164aa670f73aeffa05d9
author Winson Chung <winsonc@google.com> 1414566411 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566411 +0000

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

* commit '564cfbdef48fccb6e26b164aa670f73aeffa05d9':