tree 7f700021a19db09b590cbc3e34e95fcb31d8407a
parent 736c987340d2e3d12f7b177be3692abf4abeebb6
parent 940138de9eae9be9ef60307af9e5f7a1168af533
author Jim Miller <jaggies@google.com> 1306038913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306038913 -0700

am 940138de: am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2

* commit '940138de9eae9be9ef60307af9e5f7a1168af533':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets