am d60801f7: am a6af5fc1: Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev
am d60801f7: am a6af5fc1: Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev

* commit 'd60801f7ae223ca507ab5cb8574e68cf9e55e35f':
  Fix layout margins for Preferences in dialogs

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base