tree cba62d0d64153aa2169651696bc238591341d679
parent 564cfbdef48fccb6e26b164aa670f73aeffa05d9
parent a0a8305a53ff52ad0222b113d084a86bd2bd6a12
author Winson Chung <winsonc@google.com> 1414085533 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085533 +0000

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

* commit 'a0a8305a53ff52ad0222b113d084a86bd2bd6a12':