am c611911e: am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."

* commit 'c611911e11fbb40c5d4d2904c316e4fe2321df6e':
  The localtime_tz and mktime_tz extensions are now in bionic.
This commit is contained in:
Elliott Hughes 2012-09-24 10:20:11 -07:00 committed by Android Git Automerger
commit 95cc64b23c

Diff content is not available