Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf

    </style>

    <style name="DropTargetButtonContainer">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">0dp</item>

        <item name="android:layout_height">wrap_content</item>

    </style>

    <style name="DropTargetButton">

        <item name="android:layout_width">wrap_content</item>