am c636ff19: am 9a9ca7c1: am 7d6c3f70: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."

* commit 'c636ff1944ca9c67953e3162ba7a8c39e44fff42':
  Remove the 'Factory' time zone by not processing the 'factory' file.
This commit is contained in:
Elliott Hughes 2012-07-26 22:56:12 -07:00 committed by Android Git Automerger
commit 6320848df6
3 changed files with 1 additions and 1 deletions

View File

@ -24,7 +24,7 @@ if not os.path.isdir(bionic_libc_tools_zoneinfo_dir) or not os.path.isdir(bionic
print 'Found bionic in %s...' % bionic_dir print 'Found bionic in %s...' % bionic_dir
regions = ['africa', 'antarctica', 'asia', 'australasia', 'backward', 'etcetera', 'europe', 'factory', 'northamerica', 'southamerica'] regions = ['africa', 'antarctica', 'asia', 'australasia', 'backward', 'etcetera', 'europe', 'northamerica', 'southamerica']
def current_tzdata_version(): def current_tzdata_version():

Binary file not shown.

Binary file not shown.