tree b0401d1b0adee644198ff8c59ef749feda915db3
parent f62f1e3a07d037bc50420575b028269cc7f7ede4
parent 026b3953d4471cd43c850ee72bbca7cc77e87a34
author Elliott Hughes <enh@google.com> 1358289202 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358289202 -0800

am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bionic."

* commit '026b3953d4471cd43c850ee72bbca7cc77e87a34':
  The localtime_tz and mktime_tz extensions are now in bionic.