OSDN Git Service

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


Trivial merge