tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 62afccafaa29519ef90671b70ce6c174107b782d
parent d22d12fec9fb835e3fd653ca23d3fd29225b0913
author Vladimir Marko <vmarko@google.com> 1392411084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411084 +0000

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

* commit 'd22d12fec9fb835e3fd653ca23d3fd29225b0913':