ANDROID: Remove duplicate security fix
authorDmitry Shmidt <dimitrysh@google.com>
Wed, 31 Jan 2018 18:11:29 +0000 (10:11 -0800)
committerDmitry Shmidt <dimitrysh@google.com>
Wed, 31 Jan 2018 18:11:29 +0000 (10:11 -0800)
commit6bbd2da69c5c2b8ab57cc2171b9abe2c9b82f53e
tree29736f7f75ea476eaa8d925ebbc678d5ce5f9e7b
parentc3a2eda1e3dcdba319d3cf731233621484f41cb3
ANDROID: Remove duplicate security fix

Merge resolution problem

Change-Id: I763be7d3737179171cab26414dfea8315e5bc655
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
include/linux/bpf.h