tree cba62d0d64153aa2169651696bc238591341d679
parent 7efcb30764485860bdd292bb46181f14f729b521
parent 1d3c140e881fb3329cad50c4423d9e9e71ebafb6
author Winson Chung <winsonc@google.com> 1414085178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085178 +0000

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

* commit '1d3c140e881fb3329cad50c4423d9e9e71ebafb6':