tree 35cbafcd8dfae5a66384e5de617accbb8ba1fc44
parent a5ca4128ef40e02d7fc24f3df6dc91899b5d5b55
parent ed9df0d1761e186616bb8e174d04d6433d475c8b
author Selim Cinek <cinek@google.com> 1529343901 -0700
committer android-build-merger <android-build-merger@google.com> 1529343901 -0700

Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am: ed9df0d176

Change-Id: Ib607094d49ba35e14dd33d6993e343cda7594b5f