tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 4aadfa46a8515450945a21003af53dd18cfa0f5c
parent 47e2101d1bc35142fedeaf4bf83e3bceae2fcfa3
author Winson Chung <winsonc@google.com> 1392410117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410117 +0000

am 47e2101d: am ca29efde: am fa545133: Tweaking folder cling to support large folders.

* commit '47e2101d1bc35142fedeaf4bf83e3bceae2fcfa3':