AI 143303: am: CL 143156 am: CL 142851 ADT GLE fix #1731389: widgets dropped in <merge> lack their default layout_widht/height.
Issue: <merge> did not have layout attributes. When new widgets are
dropped in a layout, GLE only adds layout width/height if the parent
supports them.
Fix: Make <merge> have layout attributes from FrameLayout. The ideal
choice would have been ViewGroup, but since ViewGroup is abstract we
don't have any ViewDescriptor for it. FrameLayout should provide a
sensible replacement.
Note: this requires CL 142780 to compile.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143303
5 files changed
