| commit | 7cfe0d2602d5722523d25c67ad368ea0a4bf6e32 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jan 15 13:40:39 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 15 13:40:39 2013 -0800 |
| tree | 50a9c5a586768f6d7e60763abb6909d44f772dd8 | |
| parent | 0112ee219000212749052c6040b0297b082c9fea [diff] | |
| parent | 04aa0fdda60b6a492e572c2a79f21c732e8c33c8 [diff] |
am 04aa0fdd: (-s ours) 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 '04aa0fdda60b6a492e572c2a79f21c732e8c33c8': Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""