tree 845fe08549ab94bc6ce50e427a67b1a613d55ae6
parent d29c9fc18860a41f59d390b4aab937b61dd63ea1
parent 42c5847d65d3e50a3efc4e32bb913dc66c9d0e4d
author Elliott Hughes <enh@google.com> 1358285876 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358285876 -0800

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

* commit '42c5847d65d3e50a3efc4e32bb913dc66c9d0e4d':
  Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""