| commit | 294cae0f18ceae96e1a5f8b42ae9fd8064b98746 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jun 13 01:48:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 13 01:48:11 2014 +0000 |
| tree | 574ed410eb19a6731e8854181e744d401f7ef499 | |
| parent | 9552809d30a6f1ac54af8c8e9bcb616bd4da6c93 [diff] | |
| parent | 1aaed87f7f75aafe3cd99857c33e1cf4fa73c95d [diff] |
am 1aaed87f: Merge "Somewhere, the declaration of _resolv_delete_cache_for_net went missing." * commit '1aaed87f7f75aafe3cd99857c33e1cf4fa73c95d': Somewhere, the declaration of _resolv_delete_cache_for_net went missing.