tree 1565a2daa5659dcd15304ead46d5d5220a0f9017
parent b4fc64c96cad1be63b5c52af835c4a93b0e60204
parent 7d6c3f700b8089d31a33ba0f9f6eed9407724d0d
author Elliott Hughes <enh@google.com> 1343349878 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343349878 -0700

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

* commit '7d6c3f700b8089d31a33ba0f9f6eed9407724d0d':
  Remove the 'Factory' time zone by not processing the 'factory' file.