diff options
author | Elliott Hughes <enh@google.com> | 2013-01-15 14:44:16 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-15 14:44:16 -0800 |
commit | d984497a8886251540a057f379e0f016ea72696b (patch) | |
tree | b1eda8cc7f4ba541ed6bc539609a245ae0f592e9 /include/system | |
parent | b58a82295529e775fbb900ecfb2d9104b2dafdc1 (diff) | |
parent | 989c033bf3de0e81fbb9f4aad2a52d6e17093d8c (diff) | |
download | system_core-d984497a8886251540a057f379e0f016ea72696b.zip system_core-d984497a8886251540a057f379e0f016ea72696b.tar.gz system_core-d984497a8886251540a057f379e0f016ea72696b.tar.bz2 |
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.
Diffstat (limited to 'include/system')
0 files changed, 0 insertions, 0 deletions