| commit | 95cc64b23ca01d6e54619a2be5095893f8a94e63 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 24 10:20:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:20:11 2012 -0700 |
| tree | 234b0ab8d5a593ca2cfe43fc50238c6162d19e5c | |
| parent | db97f75c355a6f20e6886b093f7a9329dc95cc51 [diff] | |
| parent | c611911e11fbb40c5d4d2904c316e4fe2321df6e [diff] |
am c611911e: am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic." * commit 'c611911e11fbb40c5d4d2904c316e4fe2321df6e': The localtime_tz and mktime_tz extensions are now in bionic.