tree e7fc79dfe375fd5f84e0297198dc58ac5f22ee95
parent 3690bcb217668a26675a7144637a4eed14bf7741
parent a2b1bbc9a605819eb5ecd1df61d4f2a79f1a8f92
author Elliott Hughes <enh@google.com> 1330714185 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330714185 -0800

am a2b1bbc9: am a480cf93: resolved conflicts for merge of cfe535ef to stage-aosp-master

* commit 'a2b1bbc9a605819eb5ecd1df61d4f2a79f1a8f92':
  Upgrade to tzdata2011a.