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