tree 10da860fcff71886af91d082e31f0e1917926848
parent baa7db964162bea3d8d8a2e4f959b5690d3f8a9c
parent 1c7533131439872c2b381e6218c929b0365da3aa
author Winson Chung <winsonc@google.com> 1414566088 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566088 +0000

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

* commit '1c7533131439872c2b381e6218c929b0365da3aa':