diff options
| author | Elliott Hughes <enh@google.com> | 2012-03-02 10:49:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-02 10:49:45 -0800 |
| commit | da16ad11fe83d41d43bcf30b3aad01aafa8f5bc6 (patch) | |
| tree | e7fc79dfe375fd5f84e0297198dc58ac5f22ee95 /libc/kernel | |
| parent | 3690bcb217668a26675a7144637a4eed14bf7741 (diff) | |
| parent | a2b1bbc9a605819eb5ecd1df61d4f2a79f1a8f92 (diff) | |
| download | android_bionic-da16ad11fe83d41d43bcf30b3aad01aafa8f5bc6.tar.gz android_bionic-da16ad11fe83d41d43bcf30b3aad01aafa8f5bc6.tar.bz2 android_bionic-da16ad11fe83d41d43bcf30b3aad01aafa8f5bc6.zip | |
am a2b1bbc9: am a480cf93: resolved conflicts for merge of cfe535ef to stage-aosp-master
* commit 'a2b1bbc9a605819eb5ecd1df61d4f2a79f1a8f92':
Upgrade to tzdata2011a.
Diffstat (limited to 'libc/kernel')
0 files changed, 0 insertions, 0 deletions