am 30a6e387: Merge "Fix bug 5124712 - allow partial items when measuring height of list popups"
am 30a6e387: Merge "Fix bug 5124712 - allow partial items when measuring height of list popups"

* commit '30a6e38762769bc3e230c40520c1ac6a594188a0':
  Fix bug 5124712 - allow partial items when measuring height of list popups

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base