tree 191f0973c98b20754bf97b1afd3a8c5b84930af6
parent 99108fbb58e36c7a5d077b7d29ed13ee95214e2f
parent cd787c027b6b1bf58c51c3b0887af6730f858efe
author Robin Lee <rgl@google.com> 1489757164 +0000
committer android-build-merger <android-build-merger@google.com> 1489757164 +0000

Merge "Protect mtpd socket from VPN" am: de148c40d2 am: e80d1cfd58
am: cd787c027b

Change-Id: Idac7b125d40dfd43b51d04070f92b4f754399c4a