tree 10da860fcff71886af91d082e31f0e1917926848
parent e862c1ebac4537b2c104486de3cd965e7aff1d82
parent 86a456a7116e999dd1c8e67376f2c3b28f1f5330
author Vladimir Marko <vmarko@google.com> 1414566219 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566219 +0000

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

* commit '86a456a7116e999dd1c8e67376f2c3b28f1f5330':