tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 4adcb01928305bee63ff82b358e42b42f5045d25
parent 4974e62887c7e2a3ea368fec1bc6a272ad8ee599
author Vladimir Marko <vmarko@google.com> 1392411554 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411554 +0000

am 4974e628: am d22d12fe: am 05a5447c: am d99a88cf: am 0b791c26: Merge "Don\'t measure GONE views." into jb-ub-now-indigo-rose

* commit '4974e62887c7e2a3ea368fec1bc6a272ad8ee599':