tree eae9db07ea3085b01607b0c0070dff0345b0c708
parent c4a95d3c4b5951502f1602a79af727b6a7b5525f
parent 0b791c266ce298bf343400c09e84745edd72deeb
author Vladimir Marko <vmarko@google.com> 1381224172 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381224172 -0700

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

* commit '0b791c266ce298bf343400c09e84745edd72deeb':
  Don't measure GONE views.