tree cba62d0d64153aa2169651696bc238591341d679
parent b6a22674dd6006167b8d90d4c198f173548991f9
parent 4974e62887c7e2a3ea368fec1bc6a272ad8ee599
author Vladimir Marko <vmarko@google.com> 1414085294 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085294 +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':