| commit | bf1cb98b61c08724adf50038723fb5be52e3cd2c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 24 10:23:10 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:23:10 2012 -0700 |
| tree | 8771dbb24dd994b26b887d047abf070079ef7cdd | |
| parent | f03d602850a95888c10df99e594ada7b537388f9 [diff] | |
| parent | d43c9b989695562c5c1730a5aa63ac90d77ef8d7 [diff] |
am d43c9b98: am c611911e: am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic." * commit 'd43c9b989695562c5c1730a5aa63ac90d77ef8d7': The localtime_tz and mktime_tz extensions are now in bionic.