tree eae9db07ea3085b01607b0c0070dff0345b0c708
parent 4776bdf4d01c0a806c86379e4d6092f98340c7ea
parent d99a88cf5da831e65a6ac7c721f3ee896e25837c
author Vladimir Marko <vmarko@google.com> 1381224239 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381224239 -0700

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

* commit 'd99a88cf5da831e65a6ac7c721f3ee896e25837c':
  Don't measure GONE views.