tree 1ed35ddacb490223f3b795df84a5b1b68823c2cf
parent a59b098cac43f37b0d99a52c62ef49fec025b96d
parent 953eb18d01d1b6673131075fcd91cf1962682831
author Jorge Lucangeli Obes <jorgelo@google.com> 1490326314 +0000
committer android-build-merger <android-build-merger@google.com> 1490326314 +0000

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

Change-Id: Ice87ce790d5b02b3e34309430cf2a11743f0e123