am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"

* commit '69626dab17f9e059cfa2e8c3ce4ec9aaa5f9853e':
  Make addAddress locale safe

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