tree 48850f33184b22e8760dec79835bf064f986f749
parent 09a4a2c72fb6a0af8142f8cbbed2d7a6880e94e3
parent 852c2982e9f6d5b8e32be2d5e2c911af1d78a37d
author Craig Stout <cstout@google.com> 1427150585 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427150585 +0000

am 852c2982: am 053eb7e9: am d07078d2: am aaa3fa06: Default to using wrap content for row height.

* commit '852c2982e9f6d5b8e32be2d5e2c911af1d78a37d':