tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 42289332f6c830415e88824176c9139e9b753efd
parent 6522958d2ebe9f4fb6470407765456320ac0826e
author Adam Cohen <adamcohen@google.com> 1392410134 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410134 +0000

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

* commit '6522958d2ebe9f4fb6470407765456320ac0826e':