am 7fecf5f4: Merge "Make addAddress locale safe"
am 7fecf5f4: Merge "Make addAddress locale safe"

* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
  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