tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 5c49a8dff24feab476d2c379fbb7e521f2996c8c
parent 05a5447cec9c7aa36da5f2cd2c7bb947c227cf41
author Vladimir Marko <vmarko@google.com> 1392410179 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410179 +0000

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

* commit '05a5447cec9c7aa36da5f2cd2c7bb947c227cf41':