am 62b570e2: Merge "Java7 Locale & Script related changes."
am 62b570e2: Merge "Java7 Locale & Script related changes."

* commit '62b570e2febd1ab0614fd9000dc92412a8e109fd':
  Java7 Locale & Script related changes.

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