| commit | 25b341696042f319b118d1f88a6f9bd91cfec992 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 24 10:18:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:18:48 2012 -0700 |
| tree | ab1fe4b7ba2e6ba65c72231686694b2f716fa462 | |
| parent | 7c7609f95e536f9e5dc1c813be69171f6e2bb8f5 [diff] | |
| parent | f153ed380d94123d873d7ff04bc9b5b65f989c1d [diff] |
am f153ed38: (-s ours) am f4b34b6c: DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic." * commit 'f153ed380d94123d873d7ff04bc9b5b65f989c1d': DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."