tree 8624cfdbadbc0729d2ba4e11feae6b032a16027d
parent ac06e5223ab5ed1462d6c8346b2eaba207f449b7
parent de2fa7133374831bcb5080a43e567e2e41f84ee7
author Divya Sharma <c_shard@codeaurora.org> 1446657837 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657837 -0800
mergetag object de2fa7133374831bcb5080a43e567e2e41f84ee7
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052346 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfoACgkQ6K0/gZqxDniGTwCeJrSbX5b9t93PvWpGyzDbU7QV
 YN8AnRLCI+6f/54E5vQACjXRWJEncb4R
 =SMdz
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  extensions: libxt_socket: add --restore-skmark option
  xt_socket: add --nowildcard flag

Change-Id: I40423d9feace8d9ac76bbdc1b288520fd58127e6