tree f4151e6f69ea3398693cd5c2419536f5c41e9ca2
parent 5e34a1945a6b26dff5551a37627c5216b076d896
parent 7eba403e9a64f7153b7e5788902d4f799739158e
author Adam Powell <adamp@google.com> 1306442085 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306442085 -0700

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

* commit '7eba403e9a64f7153b7e5788902d4f799739158e':
  DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.