tree b2f39bf6014bbe47db864114cc670981f0dfca98
parent df7f24f310ee3ceb1dc9413d59d5a8816eb584ef
parent f2b3ac9502e08ef53d4eedd7e93ea9a00d185055
author Elliott Hughes <enh@google.com> 1351202969 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351202969 -0700

am f2b3ac95: Merge "Fix recovery: don\'t assert if there\'s no tzdata."

* commit 'f2b3ac9502e08ef53d4eedd7e93ea9a00d185055':
  Fix recovery: don't assert if there's no tzdata.