am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views...
am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '7eba403e':
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.