tree 5a9694160ed8928c32aad04b028e01d0625bc0f4
parent 01cbdf43aa755a624cb12e98080923225df2158e
parent 476bfca7f6b1d0fb0e4563ef4a1230e4cfe787c4
author Robin Lee <rgl@google.com> 1490657418 +0000
committer android-build-merger <android-build-merger@google.com> 1490657418 +0000

Merge "Add null checking to two protectFromVpn calls" am: 335d482d9d am: afbdf60e1d
am: 476bfca7f6

Change-Id: I3b88239b8eb7b0c6ce6c747b3f1bbb2fef458d47