tree ef4c2e16e5a165c410dfabfeffd203eb04be1265
parent d72a38129b15bcadfcd32b9d09c4a9729ce0d782
parent 4532572d2c815c7af2660dda9eee05eda09e31a1
author Jorge Lucangeli Obes <jorgelo@google.com> 1484253740 +0000
committer android-build-merger <android-build-merger@google.com> 1484253740 +0000

Merge "Remove NET_ADMIN capability from mtpd." am: 66c4c5b6b7 am: 53e3b2676b am: b7a140235e
am: 4532572d2c

Change-Id: Ia71b58e69705f3afa89d51b24c1316b2d03ed7c0