OSDN Git Service

am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtim...
authorElliott Hughes <enh@google.com>
Tue, 15 Jan 2013 21:35:58 +0000 (13:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Jan 2013 21:35:58 +0000 (13:35 -0800)
* commit '791e26d9598a72376b8a16a5ccfb5d1ae0010965':
  Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""


Trivial merge