diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-24 10:16:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 10:16:40 -0700 |
| commit | c611911e11fbb40c5d4d2904c316e4fe2321df6e (patch) | |
| tree | c4e2e66f82233ac5935c9dcf3b2781995c221bfb | |
| parent | b98865586bcf7779150c461b64e4fe49972f6351 (diff) | |
| parent | 0933c6f4d8536eb1c950bb8900ba925dc6b0b00e (diff) | |
| download | core-c611911e11fbb40c5d4d2904c316e4fe2321df6e.tar.gz | |
am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
* commit '0933c6f4d8536eb1c950bb8900ba925dc6b0b00e':
The localtime_tz and mktime_tz extensions are now in bionic.
0 files changed, 0 insertions, 0 deletions