tree 10da860fcff71886af91d082e31f0e1917926848
parent 7355f3b316115aa6ab2ec0e6a447711e08435768
parent 439cee51df40a3fbdfd4ab6279b96011d58ac9b0
author Adam Cohen <adamcohen@google.com> 1414566111 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566111 +0000

am 439cee51: am 90c22b56: am c9e9ca2d: am 6522958d: am f78729e7: am 8cacf102: Merge "Tweaking clings again to support smaller folders (Bug 10965184)" into jb-ub-now-indigo-rose

* commit '439cee51df40a3fbdfd4ab6279b96011d58ac9b0':