| commit | d43c9b989695562c5c1730a5aa63ac90d77ef8d7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 24 10:19:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:19:58 2012 -0700 |
| tree | c4e2e66f82233ac5935c9dcf3b2781995c221bfb | |
| parent | 9b87fd644574d94d962baf5671d7dc4641dda492 [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.