tree 08e82ce9803e3c49c7df7cc2ae4959d7b439d7d5
parent 1427a34d8ae9fda51a916277b4bd3e4da6ca15af
parent 22d4c4a29c453ead99f5d2e7cbb01625ff32412a
author Adam Cohen <adamcohen@google.com> 1321537887 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537887 -0800

am 22d4c4a2: am 13c690d4: am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1

* commit '22d4c4a29c453ead99f5d2e7cbb01625ff32412a':
  Modifying portals in landscape on the phone UI