tree 6af3705e679839b927f2bacaee96e75d69dc827d
parent b832f991e05dc2466bd513282785ee4f62ea913e
parent c27f7911b1493349180a1dadc7eb20ae3b5a9a1c
author Dan Willemsen <dwillemsen@google.com> 1494192035 +0000
committer android-build-merger <android-build-merger@google.com> 1494192035 +0000

Merge "Assume bionic has up-to-date linux/capability.h" am: 1445c4b932 am: c09d16234f
am: c27f7911b1

Change-Id: Ib66ee19c79c85fccd9dcf419891f99b751957c23