tree cba62d0d64153aa2169651696bc238591341d679
parent fd19bf17572e1a4d5d92fa53ad033f5d07261665
parent 90c22b567b6ccd26a71ad3a713aff1c35205af82
author Adam Cohen <adamcohen@google.com> 1414085225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085225 +0000

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 '90c22b567b6ccd26a71ad3a713aff1c35205af82':