tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent b4391f9f4d5599a91de97127246e565a9f666c29
parent 1d3c140e881fb3329cad50c4423d9e9e71ebafb6
author Winson Chung <winsonc@google.com> 1392411505 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411505 +0000

am 1d3c140e: am 6d6322d8: am 47e2101d: am ca29efde: am fa545133: Tweaking folder cling to support large folders.

* commit '1d3c140e881fb3329cad50c4423d9e9e71ebafb6':