am f1b066b5: Merge "Remove duplicate local_time.default"
am f1b066b5: Merge "Remove duplicate local_time.default"

* commit 'f1b066b5ce3ebec905cb38dbb48a77dc58d4c457':
  Remove duplicate local_time.default

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build