tree 1ed35ddacb490223f3b795df84a5b1b68823c2cf
parent cd787c027b6b1bf58c51c3b0887af6730f858efe
parent dfc7f34c62ee40f5ce47e0942021f96f62f937f7
author Jorge Lucangeli Obes <jorgelo@google.com> 1490326164 +0000
committer android-build-merger <android-build-merger@google.com> 1490326164 +0000

Merge "mtpd: Run with NET_ADMIN." am: e5c6073727
am: dfc7f34c62

Change-Id: I8afb5099159946a91a0dd1206063df4a604f1620