tree 191f0973c98b20754bf97b1afd3a8c5b84930af6
parent 4532572d2c815c7af2660dda9eee05eda09e31a1
parent e80d1cfd58936fced61f096c7ab57393c2d4de98
author Robin Lee <rgl@google.com> 1489756896 +0000
committer android-build-merger <android-build-merger@google.com> 1489756896 +0000

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

Change-Id: I9648e9b3caee84267ae30d86fc99cf7c5ed5c1b5