tree dc7d0f623847438f92ef6e3d29cd1ef08da31bcf
parent 11a00cdd9e2d8dfe8695b37a9cfbd9a23a67d2c6
parent d9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82
author Elliott Hughes <enh@google.com> 1253206080 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253206080 -0700

am d9f8adbf: am cb12fde6: Make Resources preloadable again.

Merge commit 'd9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82'

* commit 'd9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82':
  Make Resources$DefaultTimeZones preloadable again.