tree 2c1583cdc15754b27bc858259195a248a799ac6c
parent a11c381418fcd96c5665a5c50926756b3e98c37a
parent fd0fa65eeae00f58863af060950e10f20971726b
author Philip Milne <pmilne@google.com> 1360794476 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360794476 -0800

am fd0fa65e: Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child\'s size/measurements even when a child is "GONE"""

# Via Android (Google) Code Review
* commit 'fd0fa65eeae00f58863af060950e10f20971726b':
  Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""