tree 42505612e04b660f38095ae2fdc5447cb6d18985
parent b413dd2fec7ca2260388bb91d97228cfb32b4a03
parent 83d10ad735ea3f47e3aa3fbba013e4e91af21455
author Dake Gu <dake@google.com> 1501515224 +0000
committer android-build-merger <android-build-merger@google.com> 1501515224 +0000

Merge "leanback: fix crash in onMeasure when preLayout is true" into oc-support-26.0-dev
am: 83d10ad735

Change-Id: I450fdcfdbd70982ff9e81303956f28acb53920ff