tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 2b7cc99975107e82e07b7834f193b08ed79b7931
parent c9e9ca2dc3e55a8333fc8f0b886b2ca3e25419f9
author Adam Cohen <adamcohen@google.com> 1392411016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411016 +0000

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 'c9e9ca2dc3e55a8333fc8f0b886b2ca3e25419f9':