tree 08861ceceaa6955cd2b3c6c6f6f20d4384c04f1f
parent 1a18895ebcdd0724650bf349e921315d792fbdfa
parent b989c9ceda71f6f75112645b5c45af341275cbab
author Elliott Hughes <enh@google.com> 1358371895 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358371895 -0800

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

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