am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev
am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev

* commit '15b2202bacdfcc249d7f51bcd3361e6694d24267':
  Adapting translation length for a string in a dialog

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