resolve merge conflicts of 4f1b2ce to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I430cff2349fcd351a7313d7ab5b7b53029231e7d
tree: 6589a2831784a580a0c93c7bbc89cb541a297344
  1. .gitignore
  2. Android.mk
  3. CHANGES
  4. CMakeLists.txt
  5. CREDITS
  6. ChmodBPF/
  7. CleanSpec.mk
  8. GenVersion.bat
  9. INSTALL.txt
  10. LICENSE
  11. MODULE_LICENSE_BSD
  12. Makefile-devel-adds
  13. Makefile.in
  14. NOTICE
  15. README
  16. README.Win32
  17. README.aix
  18. README.dag
  19. README.hpux
  20. README.linux
  21. README.macosx
  22. README.septel
  23. README.sita
  24. README.tru64
  25. README.version
  26. SUNOS4/
  27. TODO
  28. VERSION
  29. Win32/
  30. aclocal.m4
  31. arcnet.h
  32. atmuni31.h
  33. bpf/
  34. bpf_dump.c
  35. bpf_image.c
  36. chmod_bpf
  37. cmake/
  38. cmakeconfig.h.in
  39. config.guess
  40. config.h
  41. config.h.in
  42. config.sub
  43. config/
  44. configure
  45. configure.ac
  46. dlpisubs.c
  47. dlpisubs.h
  48. etherent.c
  49. ethertype.h
  50. extract.h
  51. fad-getad.c
  52. fad-gifc.c
  53. fad-glifc.c
  54. fad-helpers.c
  55. gen_version_c.sh
  56. gen_version_header.sh
  57. gencode.c
  58. gencode.h
  59. grammar.c
  60. grammar.h
  61. grammar.y
  62. ieee80211.h
  63. inet.c
  64. install-sh
  65. lbl/
  66. llc.h
  67. missing/
  68. mkdep
  69. msdos/
  70. nametoaddr.c
  71. nametoaddr.h
  72. nlpid.h
  73. optimize.c
  74. org.tcpdump.chmod_bpf.plist
  75. pcap-bpf.c
  76. pcap-bpf.h
  77. pcap-bt-linux.c
  78. pcap-bt-linux.h
  79. pcap-bt-monitor-linux.c
  80. pcap-bt-monitor-linux.h
  81. pcap-common.c
  82. pcap-common.h
  83. pcap-config
  84. pcap-config.1
  85. pcap-config.in
  86. pcap-dag.c
  87. pcap-dag.h
  88. pcap-dbus.c
  89. pcap-dbus.h
  90. pcap-dlpi.c
  91. pcap-dos.c
  92. pcap-dos.h
  93. pcap-enet.c
  94. pcap-filter.manmisc
  95. pcap-filter.manmisc.in
  96. pcap-int.h
  97. pcap-libdlpi.c
  98. pcap-linktype.manmisc
  99. pcap-linktype.manmisc.in
  100. pcap-linux.c
  101. pcap-namedb.h
  102. pcap-netfilter-linux-android.c
  103. pcap-netfilter-linux-android.h
  104. pcap-netfilter-linux.c
  105. pcap-netfilter-linux.h
  106. pcap-new.c
  107. pcap-nit.c
  108. pcap-null.c
  109. pcap-pf.c
  110. pcap-rpcap.c
  111. pcap-rpcap.h
  112. pcap-savefile.manfile
  113. pcap-savefile.manfile.in
  114. pcap-septel.c
  115. pcap-septel.h
  116. pcap-sita.c
  117. pcap-sita.h
  118. pcap-sita.html
  119. pcap-snf.c
  120. pcap-snf.h
  121. pcap-snit.c
  122. pcap-snoop.c
  123. pcap-stdinc.h
  124. pcap-tc.c
  125. pcap-tc.h
  126. pcap-tstamp.manmisc
  127. pcap-tstamp.manmisc.in
  128. pcap-usb-linux.c
  129. pcap-usb-linux.h
  130. pcap-win32.c
  131. pcap.3pcap
  132. pcap.3pcap.in
  133. pcap.c
  134. pcap.h
  135. pcap/
  136. pcap_activate.3pcap
  137. pcap_breakloop.3pcap
  138. pcap_can_set_rfmon.3pcap
  139. pcap_close.3pcap
  140. pcap_compile.3pcap
  141. pcap_compile.3pcap.in
  142. pcap_create.3pcap
  143. pcap_datalink.3pcap
  144. pcap_datalink.3pcap.in
  145. pcap_datalink_name_to_val.3pcap
  146. pcap_datalink_val_to_name.3pcap
  147. pcap_dump.3pcap
  148. pcap_dump_close.3pcap
  149. pcap_dump_file.3pcap
  150. pcap_dump_flush.3pcap
  151. pcap_dump_ftell.3pcap
  152. pcap_dump_open.3pcap
  153. pcap_dump_open.3pcap.in
  154. pcap_file.3pcap
  155. pcap_fileno.3pcap
  156. pcap_findalldevs.3pcap
  157. pcap_freecode.3pcap
  158. pcap_get_selectable_fd.3pcap
  159. pcap_get_tstamp_precision.3pcap
  160. pcap_get_tstamp_precision.3pcap.in
  161. pcap_geterr.3pcap
  162. pcap_inject.3pcap
  163. pcap_is_swapped.3pcap
  164. pcap_lib_version.3pcap
  165. pcap_list_datalinks.3pcap
  166. pcap_list_datalinks.3pcap.in
  167. pcap_list_tstamp_types.3pcap
  168. pcap_list_tstamp_types.3pcap.in
  169. pcap_lookupdev.3pcap
  170. pcap_lookupnet.3pcap
  171. pcap_loop.3pcap
  172. pcap_major_version.3pcap
  173. pcap_next_ex.3pcap
  174. pcap_offline_filter.3pcap
  175. pcap_open_dead.3pcap
  176. pcap_open_dead.3pcap.in
  177. pcap_open_live.3pcap
  178. pcap_open_offline.3pcap
  179. pcap_open_offline.3pcap.in
  180. pcap_set_buffer_size.3pcap
  181. pcap_set_datalink.3pcap
  182. pcap_set_immediate_mode.3pcap
  183. pcap_set_promisc.3pcap
  184. pcap_set_rfmon.3pcap
  185. pcap_set_snaplen.3pcap
  186. pcap_set_timeout.3pcap
  187. pcap_set_tstamp_precision.3pcap
  188. pcap_set_tstamp_precision.3pcap.in
  189. pcap_set_tstamp_type.3pcap
  190. pcap_set_tstamp_type.3pcap.in
  191. pcap_setdirection.3pcap
  192. pcap_setfilter.3pcap
  193. pcap_setnonblock.3pcap
  194. pcap_snapshot.3pcap
  195. pcap_stats.3pcap
  196. pcap_statustostr.3pcap
  197. pcap_strerror.3pcap
  198. pcap_tstamp_type_name_to_val.3pcap
  199. pcap_tstamp_type_val_to_name.3pcap
  200. pcap_version.h
  201. pcap_version.h.in
  202. portability.h
  203. ppp.h
  204. remote-ext.h
  205. savefile.c
  206. scanner.c
  207. scanner.h
  208. scanner.l
  209. sf-pcap-ng.c
  210. sf-pcap-ng.h
  211. sf-pcap.c
  212. sf-pcap.h
  213. sockutils.c
  214. sockutils.h
  215. sunatmpos.h
  216. tests/
  217. version.c