From: Selim Cinek Date: Mon, 18 Jun 2018 17:52:53 +0000 (-0700) Subject: Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am: ed9df0d176 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=956dbb070ffba2b1e469e96b33fa9ff4a788e335;p=android-x86%2Fframeworks-base.git Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am: ed9df0d176 am: ae158f3925 Change-Id: Ieb7a009989c3f505c1f799e7eabc243929957a8b --- 956dbb070ffba2b1e469e96b33fa9ff4a788e335