commit | d984497a8886251540a057f379e0f016ea72696b | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue Jan 15 14:44:16 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 15 14:44:16 2013 -0800 |
tree | b1eda8cc7f4ba541ed6bc539609a245ae0f592e9 | |
parent | b58a82295529e775fbb900ecfb2d9104b2dafdc1 [diff] | |
parent | 989c033bf3de0e81fbb9f4aad2a52d6e17093d8c [diff] |
am 989c033b: am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bionic." * commit '989c033bf3de0e81fbb9f4aad2a52d6e17093d8c': The localtime_tz and mktime_tz extensions are now in bionic.