tree e551952aab3cac4ac6157af79e41a2797a5a57c6
parent 6fe22531fb81846a1ab69fa1b614e56562841943
parent 587ae34aabc03e607c2ec2b37b8709bdf9cc33f0
author Adam Cohen <adamcohen@google.com> 1321476380 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321476380 -0800

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

* commit '587ae34aabc03e607c2ec2b37b8709bdf9cc33f0':
  Modifying portals in landscape on the phone UI