tree 5a8f81b44102e573e6ae689855bf58a9f52a4e86
parent 6246d459a1c5be32994778c080fd7f386e884ce5
parent fd8f7f120dd04acaa7ac81680dcc058d4a1d20d4
author Jim Miller <jaggies@google.com> 1306366072 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306366072 -0700

am fd8f7f12: Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2

* commit 'fd8f7f120dd04acaa7ac81680dcc058d4a1d20d4':
  Fix 4462497: Make ownerinfo preference layout more dynamic