tree 51aa7530fa813134b8515f373c303a8b5afea8f4
parent a4ca7f443a72043b25d1646cd6a77661e09eb63b
parent 1dacfbb464d8d21c312cca681a1a297e0f632f08
author Lorenzo Colitti <lorenzo@google.com> 1426504376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426504376 +0000

am 1dacfbb4: am 7d6411b7: Merge "Support packet sockets in libcore."

* commit '1dacfbb464d8d21c312cca681a1a297e0f632f08':
  Support packet sockets in libcore.