tree 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef
parent f73c9820a65847cf25a836559ddcf639f67ad84f
parent a33dec75f343399b28dbe03da82a4357a511b19d
author Jeff Brown <jeffbrown@google.com> 1323302637 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323302637 -0800

am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1

* commit 'ff3b5a828ea1f7409af4475898689804bed10ede':
  Make the dock orientation override the HDMI orientation.