am 5a12c0c8: am fa9fc5bc: Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev
am 5a12c0c8: am fa9fc5bc: Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev

* commit '5a12c0c863be5e8c0c76dd78130cd5695044f359':
  Add a minimum height of 64dp for AlertDialog content

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