diff options
| author | Jason Chen <jasonchen@google.com> | 2011-03-02 15:32:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-02 15:32:53 -0800 |
| commit | a08eb1df005189fdf5881b0f7b2f9258a97fec00 (patch) | |
| tree | 1eb2d4ede53ca08aa14a9797d806ed80fc1a7bb6 /libc/netbsd/resolv/res_init.c | |
| parent | da14b0e1ddabf753285e913a7601aafccd294617 (diff) | |
| parent | 0ca21df5c6fbb22498cfde93b4fd4cac3235901b (diff) | |
am 0ca21df5: (-s ours) am 6519756b: Merge "DO NOT MERGE Cherry-pick of 0ee092fb2 from master" into honeycomb
* commit '0ca21df5c6fbb22498cfde93b4fd4cac3235901b':
DO NOT MERGE Cherry-pick of 0ee092fb2 from master
Diffstat (limited to 'libc/netbsd/resolv/res_init.c')
0 files changed, 0 insertions, 0 deletions