tree ac2150905177b60cc1da0d4e0f4dded0fcbdfc91
parent 0e50b2c926a8f41612a2b0d2bf00100bcbb6a5c9
parent 0d6c308c39e3c53225f2db0e9e25a52d4a281abd
author Remi NGUYEN VAN <reminv@google.com> 1572583840 -0700
committer android-build-merger <android-build-merger@google.com> 1572583840 -0700

Merge "Add API to set the sll_protocol on PacketSocket"
am: 0d6c308c39

Change-Id: I203f26229dcd580704665f7a07a391facef49a17