tree 10da860fcff71886af91d082e31f0e1917926848
parent 7d1d4e40d6107e1df2ad4b34321ac1dd549572aa
parent e623e9023f02456146ddb6228419521c473cedb5
author Winson Chung <winsonc@google.com> 1414566413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566413 +0000

am e623e902: am a0a8305a: am ffba2dfd: am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf

* commit 'e623e9023f02456146ddb6228419521c473cedb5':