| commit | e2a3fe235e6577b5956e86af3fc8b31845ef54ac | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 24 08:57:47 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 08:57:47 2012 -0700 |
| tree | 5756292892073aa6bdadcc7980dc889316b1e666 | |
| parent | b905f121c324cfec51f5b8cd424f36fc0f22676d [diff] | |
| parent | 2dbef6ae08eec8815863b89046653a1a73443a7c [diff] |
am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic." * commit '2dbef6ae08eec8815863b89046653a1a73443a7c': The localtime_tz and mktime_tz extensions are now in bionic.