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

am 157e789f: am 07c9ade5: am 33231f58: Fixing crash in empty folders. (Bug 11627191)

* commit '157e789fded47e22d93a550658c51ea304ec3b76':