am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""

* commit '791e26d9598a72376b8a16a5ccfb5d1ae0010965':
  Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
This commit is contained in:
Elliott Hughes 2013-01-15 13:35:58 -08:00 committed by Android Git Automerger
commit 42c5847d65

Diff Content Not Available